marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

include: Move NULL define to corecrt.h. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/msvcrt/corecrt.h
View File

@ -41,6 +41,14 @@
# endif # endif
#endif #endif
#ifndef NULL
#ifdef __cplusplus
#define NULL 0
#else
#define NULL ((void *)0)
#endif
#endif
#ifndef __stdcall #ifndef __stdcall
# ifdef __i386__ # ifdef __i386__
# ifdef __GNUC__ # ifdef __GNUC__

8
include/msvcrt/stddef.h
View File

@ -20,14 +20,6 @@
#include <corecrt.h> #include <corecrt.h>
#ifndef NULL
#ifdef __cplusplus
#define NULL 0
#else
#define NULL ((void *)0)
#endif
#endif
#ifdef __GNUC__ #ifdef __GNUC__
#define offsetof(s,m) __builtin_offsetof(s,m) #define offsetof(s,m) __builtin_offsetof(s,m)
#elif defined(_WIN64) #elif defined(_WIN64)

8
include/msvcrt/stdio.h
View File

@ -19,14 +19,6 @@
#define _IOSTRG 0x0040 #define _IOSTRG 0x0040
#define _IORW 0x0080 #define _IORW 0x0080
#ifndef NULL
#ifdef __cplusplus
#define NULL 0
#else
#define NULL ((void *)0)
#endif
#endif
#define STDIN_FILENO 0 #define STDIN_FILENO 0
#define STDOUT_FILENO 1 #define STDOUT_FILENO 1
#define STDERR_FILENO 2 #define STDERR_FILENO 2

8
include/msvcrt/stdlib.h
View File

@ -12,14 +12,6 @@
#include <pshpack8.h> #include <pshpack8.h>
#ifndef NULL
#ifdef __cplusplus
#define NULL 0
#else
#define NULL ((void*)0)
#endif
#endif
typedef struct typedef struct
{ {
float f; float f;

8
include/msvcrt/string.h
View File

@ -15,14 +15,6 @@
#define _NLSCMP_DEFINED #define _NLSCMP_DEFINED
#endif #endif
#ifndef NULL
#ifdef __cplusplus
#define NULL 0
#else
#define NULL ((void *)0)
#endif
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

8
include/msvcrt/time.h
View File

@ -29,14 +29,6 @@ typedef __msvcrt_long clock_t;
#define _CLOCK_T_DEFINED #define _CLOCK_T_DEFINED
#endif #endif
#ifndef NULL
#ifdef __cplusplus
#define NULL 0
#else
#define NULL ((void *)0)
#endif
#endif
#ifndef CLOCKS_PER_SEC #ifndef CLOCKS_PER_SEC
#define CLOCKS_PER_SEC 1000 #define CLOCKS_PER_SEC 1000
#endif #endif

8
include/msvcrt/wchar.h
View File

@ -17,14 +17,6 @@
extern "C" { extern "C" {
#endif #endif
#ifndef NULL
#ifdef __cplusplus
#define NULL 0
#else
#define NULL ((void *)0)
#endif
#endif
#ifndef WCHAR_MIN /* also in stdint.h */ #ifndef WCHAR_MIN /* also in stdint.h */
#define WCHAR_MIN 0U #define WCHAR_MIN 0U
#define WCHAR_MAX 0xffffU #define WCHAR_MAX 0xffffU