- Make php_virtual_cwd compile

diff --git a/Makefile.in b/Makefile.in
index 77378a906547c408a7df536b252674ece4c6d2dc..b580462243edacc9a62256b063f1ecc7387fef37 100644 (file)
--- 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 1678fe308a4fb8774b7665d38da6308ae4d47e65..a09d9826a5a0e84079b15d3d59db9972f74164a9 100644 (file)
--- 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 <unistd.h>
 #endif

diff --git a/main/php_virtual_cwd.h b/main/php_virtual_cwd.h
index 1e97732df546557df7e39f44a6ae0fd58b92e1ef..42149ebdac4af47830c974a1bdb3060c205a5342 100644 (file)
--- 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;