WIN32: More ifdef cleanups

diff --git a/lib/init.c b/lib/init.c
index ecfdcf58ad9d0c8551ec13eb1c1d8586383f81e0..e1d4980913f62a0dcc2129f1b792266a98fb27fb 100644 (file)
--- a/lib/init.c
+++ b/lib/init.c
@@ -14,7 +14,6 @@
 
 #ifdef WIN32
 #include "win32_compat.h"
-#define close closesocket
 #else
 #include <unistd.h>
 #include <strings.h>

diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
index 2fe5ed5a5886a78ab0050a3af02ddb6ff0c98d37..fe711ac5f58ccce6656c93356242a869f5adeb9a 100644 (file)
--- a/lib/libnfs-sync.c
+++ b/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>

diff --git a/lib/libnfs.c b/lib/libnfs.c
index cd5a629805dfd3b3cd18b3952033562b7bbeedc6..d7b5075f0a71fc1710168a37f6a79657f776fe5d 100644 (file)
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -19,7 +19,6 @@
  */
 #ifdef WIN32
 #include "win32_compat.h"
-#define DllExport
 #else
 
 #include <strings.h>

diff --git a/lib/pdu.c b/lib/pdu.c
index 6efd3554b23517c0cf13c2ba0163f7dbc802f243..e4f296b5eed70d71846b95adff94dfbeaee55c2f 100644 (file)
--- a/lib/pdu.c
+++ b/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*/

diff --git a/lib/socket.c b/lib/socket.c
index 66e1021c5892d52bbd3933318eba32c8a4bc7fa4..384ba132b53d2465d147c249e4467dc904e6ba36 100644 (file)
--- a/lib/socket.c
+++ b/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>

diff --git a/win32/win32_compat.h b/win32/win32_compat.h
index f15a606ef0a7b77c2d773d47068fc17ce41cc309..abdf1dbe7611684b0570c7a0e53cfacce7b851d3 100644 (file)
--- a/win32/win32_compat.h
+++ b/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