From a73ba4b2383652c3ed061f40bd374891a24938be Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Sat, 1 Apr 2000 18:11:08 +0000 Subject: [PATCH] - Make php_virtual_cwd compile --- Makefile.in | 2 +- main/php_virtual_cwd.c | 7 +++++++ main/php_virtual_cwd.h | 10 ++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 77378a9065..b580462243 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,7 @@ LTLIBRARY_SOURCES = \ configuration-parser.c configuration-scanner.c \ safe_mode.c fopen-wrappers.c php_realpath.c alloca.c \ php_ini.c SAPI.c rfc1867.c dlist.c php_content_types.c strlcpy.c \ - strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c + strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c php_virtual_cwd.c LTLIBRARY_DEPENDENCIES = \ Zend/libZend.la \ diff --git a/main/php_virtual_cwd.c b/main/php_virtual_cwd.c index 1678fe308a..a09d9826a5 100644 --- a/main/php_virtual_cwd.c +++ b/main/php_virtual_cwd.c @@ -9,6 +9,13 @@ #include "php_virtual_cwd.h" +#ifdef ZTS +#include "TSRM.h" +CWD_API int cwd_globals_id; +#else +cwd_globals_struct cwd_globals; +#endif + #ifndef PHP_WIN32 #include #endif diff --git a/main/php_virtual_cwd.h b/main/php_virtual_cwd.h index 1e97732df5..42149ebdac 100644 --- a/main/php_virtual_cwd.h +++ b/main/php_virtual_cwd.h @@ -3,6 +3,16 @@ #include "zend.h" +#ifdef PHP_WIN32 +# ifdef CWD_EXPORTS +# define CWD_API __declspec(dllexport) +# else +# define CWD_API __declspec(dllimport) +# endif +#else +#define CWD_API +#endif + typedef struct _cwd_state { char *cwd; int cwd_length; -- 2.40.0