From 750efbe5cec97caa7c2898cfdc3df8ece603f05b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Wed, 30 May 2018 15:27:28 +0200 Subject: [PATCH] Delete definitions of NULL. Bug: None Change-Id: I7cd52ba40c9d1f35a583377c4e729875fbddc068 Reviewed-on: https://webrtc-review.googlesource.com/79941 Reviewed-by: Karl Wiberg Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#23462} --- common_types.h | 4 ---- modules/video_capture/video_capture_defines.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/common_types.h b/common_types.h index f717094092..97707064c6 100644 --- a/common_types.h +++ b/common_types.h @@ -30,10 +30,6 @@ #pragma warning(disable : 4351) #endif -#ifndef NULL -#define NULL 0 -#endif - #define RTP_PAYLOAD_NAME_SIZE 32u #if defined(WEBRTC_WIN) || defined(WIN32) diff --git a/modules/video_capture/video_capture_defines.h b/modules/video_capture/video_capture_defines.h index a87f5ee2f9..ec5bf24e4c 100644 --- a/modules/video_capture/video_capture_defines.h +++ b/modules/video_capture/video_capture_defines.h @@ -17,10 +17,6 @@ namespace webrtc { -// Defines -#ifndef NULL - #define NULL 0 -#endif enum {kVideoCaptureUniqueNameLength =1024}; //Max unique capture device name lenght enum {kVideoCaptureDeviceNameLength =256}; //Max capture device name lenght