Convert more modules

[user/henk/code/inspircd.git] / src / inspircd.cpp

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 7d2fd2ad4f7cd7a1806e147d58451d1604087cd3..632319ea366a56cbbd3ca371cac870d04f588927 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -14,18 +14,19 @@
 #include "inspircd.h"
 #include "configreader.h"
 #include <signal.h>
-#ifndef WIN32
 
+#ifndef WIN32
 #include <dirent.h>
 #include <unistd.h>
 #include <sys/resource.h>
-
+#include <dlfcn.h>
+#include <getopt.h>
 /* This is just to be completely certain that the change which fixed getrusage on RH7 doesn't break anything else -- Om */  
 #ifndef RUSAGE_SELF
 #define RUSAGE_SELF 0
 #endif
-
 #endif
+
 #include <exception>
 #include <fstream>
 #include "modules.h"
@@ -38,10 +39,9 @@
 #include "command_parse.h"
 #include "exitcodes.h"
 
-#ifndef WIN32
-#include <dlfcn.h>
-#include <getopt.h>
-#else
+#ifdef WIN32
+
+/* This MUST remain static and delcared outside the class, so that WriteProcessMemory can reference it properly */
 static DWORD owner_processid = 0;
 
 DWORD WindowsForkStart(InspIRCd * Instance)
@@ -504,14 +504,10 @@ InspIRCd::InspIRCd(int argc, char** argv)
                        case 'f':
                                /* Log filename was set */
                                strlcpy(LogFileName, optarg, MAXBUF);
-                               if (owner_processid)
-                                       printf("LOG: Setting logfile to %s\n", LogFileName);
                        break;
                        case 'c':
                                /* Config filename was set */
                                strlcpy(ConfigFileName, optarg, MAXBUF);
-                               if (owner_processid)
-                                       printf("CONFIG: Setting config file to %s\n", ConfigFileName);
                        break;
                        case 0:
                                /* getopt_long_only() set an int variable, just keep going */