Delete definitions of NULL.
Bug: None Change-Id: I7cd52ba40c9d1f35a583377c4e729875fbddc068 Reviewed-on: https://webrtc-review.googlesource.com/79941 Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23462}
This commit is contained in:
@ -30,10 +30,6 @@
|
|||||||
#pragma warning(disable : 4351)
|
#pragma warning(disable : 4351)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef NULL
|
|
||||||
#define NULL 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define RTP_PAYLOAD_NAME_SIZE 32u
|
#define RTP_PAYLOAD_NAME_SIZE 32u
|
||||||
|
|
||||||
#if defined(WEBRTC_WIN) || defined(WIN32)
|
#if defined(WEBRTC_WIN) || defined(WIN32)
|
||||||
|
@ -17,10 +17,6 @@
|
|||||||
|
|
||||||
namespace webrtc
|
namespace webrtc
|
||||||
{
|
{
|
||||||
// Defines
|
|
||||||
#ifndef NULL
|
|
||||||
#define NULL 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
enum {kVideoCaptureUniqueNameLength =1024}; //Max unique capture device name lenght
|
enum {kVideoCaptureUniqueNameLength =1024}; //Max unique capture device name lenght
|
||||||
enum {kVideoCaptureDeviceNameLength =256}; //Max capture device name lenght
|
enum {kVideoCaptureDeviceNameLength =256}; //Max capture device name lenght
|
||||||
|
Reference in New Issue
Block a user