- don't redefine WINDOWS and pid_t

diff --git a/main/win95nt.h b/main/win95nt.h
index 76f98694dfcefa8cfde15aae573af1ece3853f91..57508be9177a07fc5e6d7b083f8cd29253f9fdb6 100644 (file)
--- 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