Move WIN32 equivalent function defines to w32/w32misc.h from misc.h.

Move Microsoft C compiler warning to w32/w32misc.h from misc.h.

diff --git a/include/misc.h b/include/misc.h
index 3ca3e00b47755946eec99f915b93d561f082f550..d04db17969855a608aaa94c786cefd136f984f94 100644 (file)
--- a/include/misc.h
+++ b/include/misc.h
@@ -39,21 +39,7 @@
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 
 #ifdef _WIN32
-#ifndef __GNUC__
-
-/* integral mismatch, due to misuse of sector short */
-#pragma warning (disable : 4761 )
-
-#define strncasecmp(s1, s2, s3) _strnicmp((s1), (s2), (s3))
-
-#define vsnprintf _vsnprintf
-#define snprintf _snprintf
-
-#endif /* !__GNUC__ */
-
 #include "w32misc.h"
-#define random rand
-#define srandom srand
 #endif /* _WIN32 */
 
 #ifndef S_IRWUG

diff --git a/src/lib/w32/w32misc.h b/src/lib/w32/w32misc.h
index 02ddcbcb6b7210ddb33a1aa51cec9dedec2ec6f3..26fd78e80fb0c18fcbe54f67e39107e8469d2e0a 100644 (file)
--- a/src/lib/w32/w32misc.h
+++ b/src/lib/w32/w32misc.h
@@ -35,6 +35,18 @@
 #ifndef W32MISC_H
 #define W32MISC_H
 
+#ifndef __GNUC__
+/* integral mismatch, due to misuse of sector short */
+#pragma warning (disable : 4761 )
+
+#define strncasecmp(s1, s2, s3) _strnicmp((s1), (s2), (s3))
+#endif /* !__GNUC__ */
+
+#define vsnprintf _vsnprintf
+#define snprintf _snprintf
+#define random rand
+#define srandom srand
+
 /*
  * strptime.c
  */