include: Move NULL define to corecrt.h.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-02-14 15:40:50 +01:00 committed by Alexandre Julliard
parent 44c863bec4
commit d840af4b87
7 changed files with 8 additions and 48 deletions

View File

@ -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__

View File

@ -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)

View File

@ -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

View File

@ -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;

View File

@ -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

View File

@ -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

View File

@ -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