From 80bdd19e031ca0dac2dfd4cb62ff43558d477663 Mon Sep 17 00:00:00 2001
From: Zeev Suraski <zeev@php.net>
Date: Fri, 11 Feb 2000 15:59:30 +0000
Subject: Fine tune Andi's patch

---
 main/php.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'main/php.h')

diff --git a/main/php.h b/main/php.h
index 9d710dbac1..ccccc78509 100644
--- a/main/php.h
+++ b/main/php.h
@@ -33,8 +33,6 @@
 #include "php_version.h"
 #include "zend.h"
 
-#define PHP_WIN32 ZEND_WIN32
-
 /* automake defines PACKAGE and VERSION for Zend too */
 #ifdef PACKAGE
 # undef PACKAGE
@@ -59,7 +57,7 @@ extern unsigned char second_arg_allow_ref[];
 */
 
 
-#if PHP_WIN32
+#ifdef PHP_WIN32
 #include "config.w32.h"
 #include "win95nt.h"
 #	ifdef PHP_EXPORTS
@@ -80,7 +78,7 @@ extern unsigned char second_arg_allow_ref[];
 #define DEBUG ZEND_DEBUG
 
 
-#if DEBUG || !(defined(__GNUC__)||PHP_WIN32)
+#if DEBUG || !(defined(__GNUC__)||defined(PHP_WIN32))
 #ifdef inline
 #undef inline
 #endif
@@ -170,7 +168,7 @@ extern char *strerror(int);
 #endif
 
 #if HAVE_PWD_H
-# if PHP_WIN32
+# ifdef PHP_WIN32
 #include "win32/pwd.h"
 #include "win32/param.h"
 # else
@@ -242,7 +240,7 @@ extern int ap_vsnprintf(char *, size_t, const char *, va_list);
 
 /* global variables */
 extern pval *data;
-#if !(PHP_WIN32)
+#if !defined(PHP_WIN32)
 extern char **environ;
 #define php_sleep sleep
 #endif
-- 
cgit v1.2.1