It seems that making the NewAPIs.h header globally visible causes

problems when compiling the com_dotnet extension, so I'm moving
it to be visible only to the VCWD code.
Thanks Frank :-)

diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index a40d8bed6c69bdd53a5c8b407195c8e4c6f6e68c..7e4a323a6e211b5bb17b8ae1a301cfd101424dea 100644 (file)
--- a/TSRM/tsrm_virtual_cwd.c
+++ b/TSRM/tsrm_virtual_cwd.c
@@ -34,6 +34,11 @@
 #ifdef TSRM_WIN32
 #include <io.h>
 #include "tsrm_win32.h"
+# if HAVE_NEWAPIS_H
+#  define WANT_GETLONGPATHNAME_WRAPPER
+#  define COMPILE_NEWAPIS_STUBS
+#  include <NewAPIs.h>
+# endif
 #endif
 
 #ifdef NETWARE

diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
index d08b4cc3b253e9a2e969484d66172fba2283c3ce..3e42f6b9b3282ae880c74ba05c19e9a57e508795 100644 (file)
--- a/TSRM/tsrm_win32.c
+++ b/TSRM/tsrm_win32.c
@@ -30,10 +30,6 @@
 
 #ifdef TSRM_WIN32
 
-#if HAVE_NEWAPIS_H
-# define COMPILE_NEWAPIS_STUBS
-#endif
-
 #include "tsrm_win32.h"
 
 #ifdef ZTS

diff --git a/TSRM/tsrm_win32.h b/TSRM/tsrm_win32.h
index 4a4e90c47884827d8cb3afec3633cfec29f9dfac..ffed2d559e5ea250e7fcc9a397c785995c52c3de 100644 (file)
--- a/TSRM/tsrm_win32.h
+++ b/TSRM/tsrm_win32.h
@@ -24,11 +24,6 @@
 #include "TSRM.h"
 #include <windows.h>
 
-#if HAVE_NEWAPIS_H
-# define WANT_GETLONGPATHNAME_WRAPPER
-# include <NewAPIs.h>
-#endif
-
 struct ipc_perm {
        int                     key;
        unsigned short  uid;