Strip SUPPORT_IP6LINKS #define

[user/henk/code/inspircd.git] / win / inspircd_win32wrapper.h

diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h
index 75fcc41b76505031b761fb62e9fc6fd303c9ff86..8120e193f1d25a2d6c459576341164bcafbdd74d 100644 (file)
--- a/win/inspircd_win32wrapper.h
+++ b/win/inspircd_win32wrapper.h
@@ -18,6 +18,15 @@
 #ifndef INSPIRCD_WIN32WRAPPER_H
 #define INSPIRCD_WIN32WRAPPER_H
 
+/*
+ * Starting with PSAPI version 2 for Windows 7 and Windows Server 2008 R2, this function is defined as K32GetProcessMemoryInfo in Psapi.h and exported
+ * in Kernel32.lib and Kernel32.dll. However, you should always call this function as GetProcessMemoryInfo. To ensure correct resolution of symbols
+ * for programs that will run on earlier versions ofWindows, add Psapi.lib to the TARGETLIBS macro and compile the program with PSAPI_VERSION=1.
+ * 
+ * We do this before anything to make sure it's done.
+ */
+#define PSAPI_VERSION 1
+
 #ifndef CONFIGURE_BUILD
 #include "win32service.h"
 #endif
@@ -37,8 +46,8 @@
 
 #define FD_SETSIZE 24000
 
-#define uint32_t DWORD
-#define uint16_t WORD
+typedef unsigned __int16 uint16_t;
+typedef unsigned __int32 uint32_t;
 
 /* Make builds smaller, leaner and faster */
 #define VC_EXTRALEAN
@@ -103,18 +112,24 @@
 #define popen _popen
 #define pclose _pclose
 
-/* Error macros need to be redirected to winsock error codes */
-#define ETIMEDOUT WSAETIMEDOUT
-#define ECONNREFUSED WSAECONNREFUSED
-#define EADDRINUSE WSAEADDRINUSE
-#define EINPROGRESS WSAEWOULDBLOCK
-#define EADDRNOTAVAIL WSAEADDRNOTAVAIL
+/* Error macros need to be redirected to winsock error codes, apart from on VS2010 *SIGH* */
+#if _MSC_VER < 1600
+       #define ETIMEDOUT WSAETIMEDOUT
+       #define ECONNREFUSED WSAECONNREFUSED
+       #define EADDRINUSE WSAEADDRINUSE
+       #define EINPROGRESS WSAEWOULDBLOCK
+       #define EADDRNOTAVAIL WSAEADDRNOTAVAIL
+#endif
 
 /* Convert formatted (xxx.xxx.xxx.xxx) string to in_addr struct */
-CoreExport int inet_pton(int af, const char * src, void * dst);
+CoreExport int insp_inet_pton(int af, const char * src, void * dst);
 
 /* Convert struct to formatted (xxx.xxx.xxx.xxx) string */
-CoreExport const char * inet_ntop(int af, const void * src, char * dst, socklen_t cnt);
+CoreExport const char * insp_inet_ntop(int af, const void * src, char * dst, socklen_t cnt);
+
+/* we don't want to use windows' broken inet_pton and ntop */
+#define inet_pton insp_inet_pton
+#define inet_ntop insp_inet_ntop
 
 /* Safe printf functions aren't defined in VC2003 */
 #define snprintf _snprintf
@@ -146,6 +161,7 @@ struct option
        int *flag;
        int val;
 };
+extern int optind;
 extern char optarg[514];
 int getopt_long_only (int ___argc, char *const *___argv, const char *__shortopts, const struct option *__longopts, int *__longind);