From: Jacek Caban jacek@codeweavers.com
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Huw Davies huw@codeweavers.com --- Small fix to remove _NTSYSTEM_ from dlls/nsiproxy/icmp_echo.c that I added yesterday.
dlls/nsiproxy.sys/icmp_echo.c | 2 -- dlls/nsiproxy.sys/ip.c | 2 -- dlls/winepulse.drv/pulse.c | 2 -- tools/makedep.c | 2 ++ 4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index 90a779fb67e..bf0a3eb3e04 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -21,8 +21,6 @@ #pragma makedep unix #endif
-#define _NTSYSTEM_ - #include "config.h" #include <stdarg.h>
diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index c7ec2e89b16..432fe9d8e65 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -22,8 +22,6 @@ #pragma makedep unix #endif
-#define _NTSYSTEM_ - #include "config.h" #include <stdarg.h>
diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 2e6ad4848eb..bce70ac358c 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -22,8 +22,6 @@ #pragma makedep unix #endif
-#define _NTSYSTEM_ - #include <stdarg.h> #include <pthread.h> #include <math.h> diff --git a/tools/makedep.c b/tools/makedep.c index 121fd4f3565..fafb54b94f5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2261,6 +2261,8 @@ static struct strarray get_source_defines( struct makefile *make, struct incl_fi strarray_add( &ret, strmake( "-I%s", make->include_paths.str[i] )); strarray_addall( &ret, make->define_args ); strarray_addall( &ret, get_expanded_file_local_var( make, obj, "EXTRADEFS" )); + if ((source->file->flags & FLAG_C_UNIX) && make->native_unix_lib) + strarray_add( &ret, "-D_NTSYSTEM_" ); if ((source->file->flags & FLAG_C_UNIX) && *dll_ext) strarray_add( &ret, "-DWINE_UNIX_LIB" ); return ret; }