Module class has a member ServerInstance, so remove any extra refs still lingering...

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

diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h
index 6ce3c6888f95dcaf907c0952868207745d774034..37386d6791beaadf21fbe6b3e78b98bd97e8feb7 100644 (file)
--- a/win/inspircd_win32wrapper.h
+++ b/win/inspircd_win32wrapper.h
@@ -22,6 +22,12 @@
    I think this is more reasonable than using WIN32, especially if we're gonna be doing 64-bit compiles */\r
 #define WINDOWS 1\r
 \r
+/* Begone shitty 'safe STL' warnings */\r
+#define _SCL_SECURE_NO_WARNINGS\r
+#define _CRT_SECURE_NO_WARNINGS\r
+#define _AFX_SECURE_NO_WARNINGS\r
+#define _ATL_SECURE_NO_WARNINGS\r
+\r
 /* Macros for exporting symbols - dependant on what is being compiled */\r
 \r
 #ifdef DLL_BUILD\r
@@ -34,6 +40,9 @@
 \r
 /* Disable the deprecation warnings.. it spams :P */\r
 #define _CRT_SECURE_NO_DEPRECATE\r
+#define _SCL_SECURE_NO_DEPRECATE\r
+\r
+#include <string>\r
 \r
 /* Say we're building on windows 2000. Anyone running something older than this\r
  * reeeeeeeally needs to upgrade! */\r
@@ -52,7 +61,7 @@
 #include <algorithm>\r
 \r
 /* strcasecmp is not defined on windows by default */\r
-#define strcasecmp stricmp\r
+#define strcasecmp _stricmp\r
 \r
 /* Error macros need to be redirected to winsock error codes */\r
 #define ETIMEDOUT WSAETIMEDOUT\r
@@ -135,7 +144,6 @@ CoreExport void closedir(DIR * handle);
 #pragma warning(disable:4800)\r
 #pragma warning(disable:4251)\r
 #pragma warning(disable:4275)\r
-#pragma warning(disable:4996)\r
 #pragma warning(disable:4244)          // warning C4244: '=' : conversion from 'long' to 'short', possible loss of data\r
 #pragma warning(disable:4267)          // warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data\r
 #pragma warning(disable:4805)          // warning C4805: '!=' : unsafe mix of type 'char' and type 'bool' in operation\r
@@ -152,6 +160,7 @@ typedef signed char int8_t;
 typedef signed long int32_t;\r
 typedef signed long long int64_t;\r
 \r
+/* Shared memory allocation functions */\r
 void * ::operator new(size_t iSize);\r
 void ::operator delete(void * ptr);\r
 \r
@@ -162,5 +171,8 @@ void InitIPC();
 void CheckIPC(InspIRCd * Instance);\r
 void CloseIPC();\r
 \r
+/* Look up the nameserver in use from the registry on windows */\r
+std::string FindNameServerWin();\r
+\r
 #endif\r
 \r