- Baby steps with PHP_WIN32 :)

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 28706af51416c49b330e2efbeae392de008131d5..db9f783fff77e27296f48cd09941eff69e36b953 100644 (file)
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -29,7 +29,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#if MSVC5
+#if PHP_WIN32
 #include <windows.h>
 #include <winsock.h>
 #define O_RDONLY _O_RDONLY
@@ -45,7 +45,7 @@
 #include "zend_compile.h"
 
 #if HAVE_PWD_H
-#if MSVC5
+#if PHP_WIN32
 #include "win32/pwd.h"
 #else
 #include <pwd.h>
@@ -61,7 +61,7 @@
 #define S_ISREG(mode)  (((mode)&S_IFMT) == S_IFREG)
 #endif
 
-#if MSVC5
+#if PHP_WIN32
 #include <winsock.h>
 #else
 #include <netinet/in.h>
@@ -69,7 +69,7 @@
 #include <arpa/inet.h>
 #endif
 
-#if MSVC5
+#if PHP_WIN32
 #undef AF_UNIX
 #endif
 

diff --git a/main/main.c b/main/main.c
index 03ee7ca637fd06b3401dc23491b9233b77bf4ba0..e37608b0ba2bd28943b8fd36108cbb6dea5e48a3 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -24,7 +24,7 @@
 
 #include <stdio.h>
 #include "php.h"
-#ifdef MSVC5
+#if PHP_WIN32
 #include "win32/time.h"
 #include "win32/signal.h"
 #include <process.h>

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 403122f1e2f24a3f023d70e5b75ee55c3d09aecb..e83830f2869c3414c73fb1bac4a4b915e589bf69 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include "php.h"
-#ifdef MSVC5
+#if PHP_WIN32
 #include "win32/time.h"
 #include "win32/signal.h"
 #include <process.h>