cvs: /php4/ext/zlib zlib.c
| From: | Andi Gutmans | Date: | Thu, 10 Feb 2000 21:56:01 +0000 |
| Subject: | cvs: /php4/ext/zlib zlib.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-10070@lists.php.net to get a copy of this message | ||
andi Thu Feb 10 13:56:01 2000 EDT
Modified files:
/php4/ext/zlib zlib.c
Log:
- A bit more PHP_WIN32 work
Index: php4/ext/zlib/zlib.c
diff -u php4/ext/zlib/zlib.c:1.31 php4/ext/zlib/zlib.c:1.32
--- php4/ext/zlib/zlib.c:1.31 Tue Feb 8 13:29:18 2000
+++ php4/ext/zlib/zlib.c Thu Feb 10 13:55:30 2000
@@ -16,7 +16,7 @@
| Stefan Röhrich <sr@linux.de> |
+----------------------------------------------------------------------+
*/
-/* $Id: zlib.c,v 1.31 2000/02/08 21:29:18 zeev Exp $ */
+/* $Id: zlib.c,v 1.32 2000/02/10 21:55:30 andi Exp $ */
#define IS_EXT_MODULE
#include "php.h"
@@ -27,7 +27,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#if (WIN32|WINNT)
+#if PHP_WIN32
#include <windows.h>
#include <winsock.h>
#define O_RDONLY _O_RDONLY
@@ -42,7 +42,7 @@
#include "php_zlib.h"
#include "fopen-wrappers.h"
#if HAVE_PWD_H
-#if WIN32|WINNT
+#if PHP_WIN32
#include "win32/pwd.h"
#else
#include <pwd.h>
@@ -50,7 +50,7 @@
#endif
#include "snprintf.h"
#if HAVE_ZLIB
-#if defined(HAVE_UNISTD_H) && (WIN32|WINNT)
+#if defined(HAVE_UNISTD_H) && PHP_WIN32
#undef HAVE_UNISTD_H
#endif
@@ -197,7 +197,7 @@
}
/* Absolute path open - prepend document_root in safe mode */
-#if WIN32|WINNT
+#if PHP_WIN32
if ((*filename == '\\')||(*filename == '/')||(filename[1] == ':')) {
#else
if (*filename == '/') {
@@ -240,7 +240,7 @@
ptr = pathbuf;
while (ptr && *ptr) {
-#if WIN32|WINNT
+#if PHP_WIN32
end = strchr(ptr, ';');
#else
end = strchr(ptr, ':');