WIN32: More ifdef cleanups

lib/init.c

@@ -14,7 +14,6 @@
 
 #ifdef WIN32
 #include "win32_compat.h"
-#define close closesocket
 #else
 #include <unistd.h>
 #include <strings.h>

lib/libnfs-sync.c

@@ -19,8 +19,6 @@
  */
 #ifdef WIN32
 #include "win32_compat.h"
-#define DllExport
-#define HAVE_POLL_H
 #else
 #include <strings.h>
 #include <unistd.h>

lib/libnfs.c

@@ -19,7 +19,6 @@
  */
 #ifdef WIN32
 #include "win32_compat.h"
-#define DllExport
 #else
 
 #include <strings.h>

lib/pdu.c

@@ -16,9 +16,6 @@
 */
 #ifdef WIN32
 #include "win32_compat.h"
-#ifndef MSG_DONTWAIT
-#define MSG_DONTWAIT 0
-#endif
 #else
 #include <strings.h>
 #endif/*WIN32*/

lib/socket.c

@@ -16,8 +16,6 @@
 */
 #ifdef WIN32
 #include "win32_compat.h"
-#define ioctl ioctlsocket
-#define close closesocket
 #else
 #include <unistd.h>
 #include <arpa/inet.h>

win32/win32_compat.h

@@ -22,7 +22,6 @@ THE SOFTWARE.
 */
 /*Adaptions by memphiz@xbmc.org*/
 
-#ifdef WIN32
 #ifndef win32_COMPAT_H_
 #define win32_COMPAT_H_
 #define NO_IPv6 1
@@ -95,6 +94,9 @@ struct pollfd {
 };
 #endif
 
+#define close closesocket
+#define ioctl ioctlsocket
+
 /* Wrapper macros to call misc. functions win32 is missing */
 #define poll(x, y, z)        win32_poll(x, y, z)
 #define inet_pton(x,y,z)     win32_inet_pton(x,y,z)
@@ -102,5 +104,7 @@ int     win32_inet_pton(int af, const char * src, void * dst);
 int     win32_poll(struct pollfd *fds, unsigned int nfsd, int timeout);
 int     win32_gettimeofday(struct timeval *tv, struct timezone *tz);
 
+#define DllExport
+#define HAVE_POLL_H
+
 #endif//win32_COMPAT_H_
-#endif//WIN32