cvs: /php4 Makefile.in php_virtual_cwd.c php_virtual_cwd.h
| From: | Andi Gutmans | Date: | Sat, 01 Apr 2000 18:11:39 +0000 |
| Subject: | cvs: /php4 Makefile.in php_virtual_cwd.c php_virtual_cwd.h | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-12995@lists.php.net to get a copy of this message | ||
andi Sat Apr 1 10:11:39 2000 EDT
Modified files:
/php4 Makefile.in php_virtual_cwd.c php_virtual_cwd.h
Log:
- Make php_virtual_cwd compile
Index: php4/Makefile.in
diff -u php4/Makefile.in:1.77 php4/Makefile.in:1.78
--- php4/Makefile.in:1.77 Wed Mar 29 16:43:09 2000
+++ php4/Makefile.in Sat Apr 1 10:11:08 2000
@@ -14,7 +14,7 @@
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 \
Index: php4/php_virtual_cwd.c
diff -u php4/php_virtual_cwd.c:1.16 php4/php_virtual_cwd.c:1.17
--- php4/php_virtual_cwd.c:1.16 Sat Apr 1 09:08:03 2000
+++ php4/php_virtual_cwd.c Sat Apr 1 10:11:08 2000
@@ -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
Index: php4/php_virtual_cwd.h
diff -u php4/php_virtual_cwd.h:1.2 php4/php_virtual_cwd.h:1.3
--- php4/php_virtual_cwd.h:1.2 Sat Apr 1 09:20:29 2000
+++ php4/php_virtual_cwd.h Sat Apr 1 10:11:08 2000
@@ -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;