WIN32: More ifdef cleanups

[deb_libnfs.git] / win32 / win32_compat.h

diff --git a/win32/win32_compat.h b/win32/win32_compat.h
index 43f518e3b9cc7d2cb394390a16d675099ecb8384..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
@@ -79,6 +78,8 @@ typedef int socklen_t;
 #define MSG_DONTWAIT 0
 #define ssize_t SSIZE_T
 
+#if(_WIN32_WINNT < 0x0600)
+
 #define POLLIN      0x0001    /* There is data to read */
 #define POLLPRI     0x0002    /* There is urgent data to read */
 #define POLLOUT     0x0004    /* Writing now will not block */
@@ -91,6 +92,10 @@ struct pollfd {
     short events;     /* requested events */
     short revents;    /* returned events */
 };
+#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)
@@ -99,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