Clean up w32misc.h, sysdep_w32.h not to override needlessly

diff --git a/src/client/sysdep_w32.h b/src/client/sysdep_w32.h
index acb155f03c3737a61a0428d27a65d42abaf7b5eb..15b3afe1d83bfd8a7b6bbceb0a312aff2289b172 100644 (file)
--- a/src/client/sysdep_w32.h
+++ b/src/client/sysdep_w32.h
@@ -34,6 +34,7 @@
 
 #ifndef _SYSDEF_W32_H
 #include <getopt.h>
+#include <stdio.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <windows.h>
@@ -78,7 +79,9 @@ extern void w32_sysdep_init(void);
 #define connect(sockfd, addr, addrlen) \
     w32_connect((sockfd), (addr), (addrlen))
 
+#ifdef _MSC_VER
 #define pclose _pclose
 #define popen _popen
 #define snprintf _snprintf
 #endif
+#endif

diff --git a/src/lib/w32/w32misc.h b/src/lib/w32/w32misc.h
index 266b83def83502909d492c6cb901a0a63d434d99..55195538de4f3c58db7c71b08ea3f27f1b13b92e 100644 (file)
--- a/src/lib/w32/w32misc.h
+++ b/src/lib/w32/w32misc.h
@@ -25,16 +25,22 @@
  *
  *  ---
  *
- *  w32misc.h: POSIX emulation for WIN32
- *     Stuff that can not be put in the equivalent include files
+ *  w32misc.h: POSIX emulation for WIN32, miscellaneous stuff
  *
  *  Known contributors to this file:
  *     Ron Koenderink, 2007
  */
 
+/*
+ * Stuff that cannot be put in the "correct" include files.  More of
+ * that in unistd.h.
+ */
+
 #ifndef W32MISC_H
 #define W32MISC_H
 
+#include <stddef.h>
+
 #ifdef _MSC_VER
 /* integral mismatch, due to misuse of sector short */
 #pragma warning (disable : 4761 )
@@ -52,21 +58,22 @@
 #endif
 
 /* stdio.h */
-#define vsnprintf _vsnprintf
+#ifdef _MSC_VER
 #define snprintf _snprintf
+#define vsnprintf _vsnprintf
+#endif
 
 /* stdlib.h */
-#include <io.h>
 extern char *initstate(unsigned seed, char *state, size_t size);
 extern long random(void);
 extern char *setstate(char *state);
 extern void srandom(unsigned seed);
 
 /* sys/types.h */
+#ifdef _MSC_VER
 typedef unsigned short mode_t;
 typedef long off_t;
 typedef int pid_t;
-#ifdef _MSC_VER
 typedef int __w64 ssize_t;
 #endif