From c7f940a84e6d741780591a3e429c665c5a8aaa00 Mon Sep 17 00:00:00 2001
From: Ron Koenderink <rkoenderink@yahoo.ca>
Date: Wed, 15 Aug 2007 02:15:17 +0000
Subject: [PATCH] Move WIN32 equivalent function defines to w32/w32misc.h from
 misc.h. Move Microsoft C compiler warning to w32/w32misc.h from misc.h.

---
 include/misc.h        | 14 --------------
 src/lib/w32/w32misc.h | 12 ++++++++++++
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/include/misc.h b/include/misc.h
index 3ca3e00b..d04db179 100644
--- 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 02ddcbcb..26fd78e8 100644
--- 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
  */