From bc5c9d8d7b0a32e6d716141c0ff2d7f5015c4658 Mon Sep 17 00:00:00 2001
From: Andi Gutmans <andi@php.net>
Date: Thu, 10 Feb 2000 17:03:53 +0000
Subject: - Finally beautify those WIN32|WINNT checks

---
 Zend/zend.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'Zend/zend.h')

diff --git a/Zend/zend.h b/Zend/zend.h
index 94e9cc0f7f..00e4a67d97 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -37,7 +37,9 @@
  * general definitions
  */
 
-#if (defined(WINNT) && WINNT) || (defined(WIN32) && WIN32)
+#define ZEND_WIN32 ((defined(WINNT) && WINNT) || (defined(WIN32) && WIN32))
+
+#if ZEND_WIN32
 # include "zend_config.w32.h"
 #else
 # include "zend_config.h"
@@ -63,7 +65,7 @@
 # define DL_FETCH_SYMBOL			dlsym
 # define DL_HANDLE					void *
 # define ZEND_EXTENSIONS_SUPPORT	1
-#elif (WIN32||WINNT)
+#elif (ZEND_WIN32)
 # define DL_LOAD(libname)			LoadLibrary(libname)
 # define DL_FETCH_SYMBOL			GetProcAddress
 # define DL_UNLOAD					FreeLibrary
@@ -350,7 +352,7 @@ END_EXTERN_C()
 
 #define ZEND_MAX_RESERVED_RESOURCES	1
 
-#if (WINNT|WIN32)
+#if (ZEND_WIN32)
 /* Only use this macro if you know for sure that all of the switches values
    are covered by its case statements */
 #define EMPTY_SWITCH_DEFAULT_CASE() \
-- 
cgit v1.2.1