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 a876b86bae1af3ad10954eeb97f3a9f1a55d8de7..37386d6791beaadf21fbe6b3e78b98bd97e8feb7 100644 (file)
--- a/win/inspircd_win32wrapper.h
+++ b/win/inspircd_win32wrapper.h
@@ -1,14 +1,14 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
- *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
- *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
- *
- * ---------------------------------------------------
+/*       +------------------------------------+\r
+ *       | Inspire Internet Relay Chat Daemon |\r
+ *       +------------------------------------+\r
+ *\r
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team\r
+ * See: http://www.inspircd.org/wiki/index.php/Credits\r
+ *\r
+ * This program is free but copyrighted software; see\r
+ *            the file COPYING for details.\r
+ *\r
+ * ---------------------------------------------------\r
  */\r
 \r
 /* Windows Port\r
@@ -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
@@ -32,6 +38,12 @@
 #define DllExport __declspec(dllimport)\r
 #endif\r
 \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
 \r
@@ -49,12 +61,12 @@
 #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
-#define ECONNREFUSED WSAECONNREFUSED
-#define EADDRINUSE WSAEADDRINUSE
+#define ETIMEDOUT WSAETIMEDOUT\r
+#define ECONNREFUSED WSAECONNREFUSED\r
+#define EADDRINUSE WSAEADDRINUSE\r
 #define EINPROGRESS WSAEWOULDBLOCK\r
 \r
 /* Remember file descriptors are treated differently on windows ;) */\r
@@ -86,22 +98,22 @@ CoreExport int geteuid();
 CoreExport int printf_c(const char * format, ...);\r
 \r
 /* getopt() wrapper */\r
-# define no_argument            0
-# define required_argument      1
+# define no_argument            0\r
+# define required_argument      1\r
 # define optional_argument      2\r
-struct option
-{
-       char *name;
-       int has_arg;
-       int *flag;
-       int val;
-};
+struct option\r
+{\r
+       char *name;\r
+       int has_arg;\r
+       int *flag;\r
+       int val;\r
+};\r
 extern char optarg[514];\r
 int getopt_long_only (int ___argc, char *const *___argv, const char *__shortopts, const struct option *__longopts, int *__longind);\r
 \r
 /* Accept Handlers */\r
-int CoreExport __accept_socket(SOCKET s, sockaddr * addr, int * addrlen, void * acceptevent);\r
-int CoreExport __getsockname(SOCKET s, sockaddr * name, int * namelen, void * acceptevent);\r
+CoreExport int __accept_socket(SOCKET s, sockaddr * addr, int * addrlen, void * acceptevent);\r
+CoreExport int __getsockname(SOCKET s, sockaddr * name, int * namelen, void * acceptevent);\r
 \r
 /* Module Loading */\r
 #define dlopen(path, state) (void*)LoadLibrary(path)\r
@@ -132,13 +144,13 @@ 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
 #pragma warning(disable:4311)          // warning C4311: 'type cast' : pointer truncation from 'accept_overlap *' to 'int'\r
 #pragma warning(disable:4312)          // warning C4312: 'type cast' : conversion from 'int' to 'HANDLE' of greater size\r
 #pragma warning(disable:4355)          // warning C4355: 'this' : used in base member initializer list\r
+#pragma warning(disable:4996)          // warning C4996: 'std::_Traits_helper::move_s' was declared deprecated\r
 \r
 /* Mehhhh... typedefs. */\r
 \r
@@ -148,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
@@ -158,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