From: Pierre Joye <pajoye@php.net>
Date: Sat, 5 Jul 2008 18:50:10 +0000 (+0000)
Subject: - don't redefine WINDOWS and pid_t
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1394
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c82616c27c07a50fb9e9999c0da774f58048ccc;p=php

- don't redefine WINDOWS and pid_t
---

diff --git a/main/win95nt.h b/main/win95nt.h
index 76f98694df..57508be917 100644
--- a/main/win95nt.h
+++ b/main/win95nt.h
@@ -52,7 +52,7 @@ typedef char * caddr_t;
 #define off_t		_off_t
 typedef unsigned int uint;
 typedef unsigned long ulong;
-#if !NSAPI
+#if !NSAPI && !defined(pid_t)
 typedef long pid_t;
 #endif
 
@@ -72,7 +72,9 @@ typedef long pid_t;
 #endif
 
 /* General Windows stuff */
-#define WINDOWS 1
+#ifndef WINDOWS
+# define WINDOWS 1
+#endif
 
 /* Prevent use of VC5 OpenFile function */
 #define NOOPENFILE