[PATCH 1/6] makedep: Always define _NTSYSTEM_ for native Unix libraries.

[Jacek Caban]

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
  dlls/nsiproxy.sys/ip.c     | 2 --
  dlls/winepulse.drv/pulse.c | 2 --
  tools/makedep.c            | 2 ++
  3 files changed, 2 insertions(+), 4 deletions(-)

[PATCH v2] makedep: Always define _NTSYSTEM_ for native Unix libraries.

[Huw Davies]

From: Jacek Caban <jacek(a)codeweavers.com>

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Huw Davies <huw(a)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;
 }
-- 
2.25.1

[PATCH v2] makedep: Always define _NTSYSTEM_ for native Unix libraries.

[Alexandre Julliard]

Huw Davies <huw(a)codeweavers.com> writes:
> From: Jacek Caban <jacek(a)codeweavers.com>
>
> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
> Signed-off-by: Huw Davies <huw(a)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(-)

I'd suggest to use WINE_UNIX_LIB for this instead of adding more
defines.

-- 
Alexandre Julliard
julliard(a)winehq.org

[PATCH v2] makedep: Always define _NTSYSTEM_ for native Unix libraries.

[Jacek Caban]

On 10/5/21 4:00 PM, Alexandre Julliard wrote:
> Huw Davies <huw(a)codeweavers.com> writes:
> > From: Jacek Caban <jacek(a)codeweavers.com>
> >
> > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
> > Signed-off-by: Huw Davies <huw(a)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(-)
> > I'd suggest to use WINE_UNIX_LIB for this instead of adding more
> > defines.

The drawback of WINE_UNIX_LIB is that it's also defined for Unix libs 
not using __wine_unix_call interface, so we will stop using 
DECLSPEC_HIDDEN for ntdll declarations there. It shouldn't cause 
problems, through. I will send a new version once I have it tested.


Thanks,

Jacek