Jacek Caban : include: Move NULL define to corecrt.h.
Alexandre Julliard
julliard at winehq.org
Sun Feb 16 15:23:59 CST 2020
Module: wine
Branch: master
Commit: d840af4b872cf3ed10b122902a68ba1756be8e25
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d840af4b872cf3ed10b122902a68ba1756be8e25
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Feb 14 15:40:50 2020 +0100
include: Move NULL define to corecrt.h.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/msvcrt/corecrt.h | 8 ++++++++
include/msvcrt/stddef.h | 8 --------
include/msvcrt/stdio.h | 8 --------
include/msvcrt/stdlib.h | 8 --------
include/msvcrt/string.h | 8 --------
include/msvcrt/time.h | 8 --------
include/msvcrt/wchar.h | 8 --------
7 files changed, 8 insertions(+), 48 deletions(-)
diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h
index 38acf8512e..cff4549d37 100644
--- a/include/msvcrt/corecrt.h
+++ b/include/msvcrt/corecrt.h
@@ -41,6 +41,14 @@
# endif
#endif
+#ifndef NULL
+#ifdef __cplusplus
+#define NULL 0
+#else
+#define NULL ((void *)0)
+#endif
+#endif
+
#ifndef __stdcall
# ifdef __i386__
# ifdef __GNUC__
diff --git a/include/msvcrt/stddef.h b/include/msvcrt/stddef.h
index 052132ed71..12025d53dc 100644
--- a/include/msvcrt/stddef.h
+++ b/include/msvcrt/stddef.h
@@ -20,14 +20,6 @@
#include <corecrt.h>
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void *)0)
-#endif
-#endif
-
#ifdef __GNUC__
#define offsetof(s,m) __builtin_offsetof(s,m)
#elif defined(_WIN64)
diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h
index ecaa7fe611..8a31835bea 100644
--- a/include/msvcrt/stdio.h
+++ b/include/msvcrt/stdio.h
@@ -19,14 +19,6 @@
#define _IOSTRG 0x0040
#define _IORW 0x0080
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void *)0)
-#endif
-#endif
-
#define STDIN_FILENO 0
#define STDOUT_FILENO 1
#define STDERR_FILENO 2
diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h
index 91fcc2a672..78fc5fba75 100644
--- a/include/msvcrt/stdlib.h
+++ b/include/msvcrt/stdlib.h
@@ -12,14 +12,6 @@
#include <pshpack8.h>
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void*)0)
-#endif
-#endif
-
typedef struct
{
float f;
diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h
index 96421cb491..f8bc40fb2a 100644
--- a/include/msvcrt/string.h
+++ b/include/msvcrt/string.h
@@ -15,14 +15,6 @@
#define _NLSCMP_DEFINED
#endif
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void *)0)
-#endif
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h
index d55e8bbf81..9ed27f5f9e 100644
--- a/include/msvcrt/time.h
+++ b/include/msvcrt/time.h
@@ -29,14 +29,6 @@ typedef __msvcrt_long clock_t;
#define _CLOCK_T_DEFINED
#endif
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void *)0)
-#endif
-#endif
-
#ifndef CLOCKS_PER_SEC
#define CLOCKS_PER_SEC 1000
#endif
diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h
index 1fcbaa9399..119f8a2a41 100644
--- a/include/msvcrt/wchar.h
+++ b/include/msvcrt/wchar.h
@@ -17,14 +17,6 @@
extern "C" {
#endif
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void *)0)
-#endif
-#endif
-
#ifndef WCHAR_MIN /* also in stdint.h */
#define WCHAR_MIN 0U
#define WCHAR_MAX 0xffffU
More information about the wine-cvs
mailing list