diff options
| author | Wez Furlong <wez@php.net> | 2003-12-22 22:30:50 (GMT) |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2003-12-22 22:30:50 (GMT) |
| commit | f936f2983daf1c2636102de5b0a66c96fc3a6f9e (patch) | |
| tree | 317f23fe09a4fd674b2928f6d3e155c605bf63d5 /TSRM | |
| parent | b58d3719277139258f6c6b171783ee6975ce57d6 (diff) | |
| download | php-f936f2983daf1c2636102de5b0a66c96fc3a6f9e.tar.gz | |
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 :-)
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.c | 5 | ||||
| -rw-r--r-- | TSRM/tsrm_win32.c | 4 | ||||
| -rw-r--r-- | TSRM/tsrm_win32.h | 5 |
3 files changed, 5 insertions, 9 deletions
diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index a40d8be..7e4a323 100644 --- 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 d08b4cc..3e42f6b 100644 --- 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 4a4e90c..ffed2d5 100644 --- 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; |