summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2000-02-10 21:55:30 +0000
committerAndi Gutmans <andi@php.net>2000-02-10 21:55:30 +0000
commit8d012c45e257214b79f22c207deed551c366bdad (patch)
treee736a8eac22fa5f58d7b09bf5864725173a88cbe
parent29280bb9ecbc459c0005a48001f5dd1a62963cd6 (diff)
downloadphp-git-8d012c45e257214b79f22c207deed551c366bdad.tar.gz
- A bit more PHP_WIN32 work
-rw-r--r--ext/zlib/zlib.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 6886aff995..1b8b39e23a 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -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 @@ static gzFile *php_gzopen_with_path(char *filename, char *mode, char *path, char
}
/* 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 @@ static gzFile *php_gzopen_with_path(char *filename, char *mode, char *path, char
ptr = pathbuf;
while (ptr && *ptr) {
-#if WIN32|WINNT
+#if PHP_WIN32
end = strchr(ptr, ';');
#else
end = strchr(ptr, ':');