diff options
Diffstat (limited to 'win')
-rw-r--r-- | win/inspircd_namedpipe.cpp | 4 | ||||
-rw-r--r-- | win/inspircd_namedpipe.h | 10 | ||||
-rw-r--r-- | win/inspircd_win32wrapper.cpp | 6 | ||||
-rw-r--r-- | win/inspircd_win32wrapper.h | 7 |
4 files changed, 11 insertions, 16 deletions
diff --git a/win/inspircd_namedpipe.cpp b/win/inspircd_namedpipe.cpp index 93d7c423a..95c0ae578 100644 --- a/win/inspircd_namedpipe.cpp +++ b/win/inspircd_namedpipe.cpp @@ -6,7 +6,7 @@ #include <psapi.h>
-IPCThread::IPCThread(InspIRCd* Instance) : Thread(), ServerInstance(Instance)
+IPCThread::IPCThread()
{
if (!initwmi())
ServerInstance->Logs->Log("IPC", DEBUG, "Could not initialise WMI. CPU percantage reports will not be available.");
@@ -127,7 +127,7 @@ void IPCThread::SetResult(int newresult) }
-IPC::IPC(InspIRCd* Srv) : ServerInstance(Srv)
+IPC::IPC()
{
/* The IPC pipe is threaded */
thread = new IPCThread(Srv);
diff --git a/win/inspircd_namedpipe.h b/win/inspircd_namedpipe.h index 98647d1b8..eef2c9df0 100644 --- a/win/inspircd_namedpipe.h +++ b/win/inspircd_namedpipe.h @@ -4,19 +4,16 @@ #include "threadengine.h" #include <windows.h> -class InspIRCd; - class IPCThread : public Thread { BOOL Connected; DWORD BytesRead; BOOL Success; HANDLE Pipe; - InspIRCd* ServerInstance; char status[MAXBUF]; int result; public: - IPCThread(InspIRCd* Instance); + IPCThread(); virtual ~IPCThread(); virtual void Run(); const char GetStatus(); @@ -28,12 +25,11 @@ class IPCThread : public Thread class IPC { private: - InspIRCd* ServerInstance; IPCThread* thread; public: - IPC(InspIRCd* Srv); + IPC(); void Check(); ~IPC(); }; -#endif
\ No newline at end of file +#endif diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp index 1008cb838..223fb648e 100644 --- a/win/inspircd_win32wrapper.cpp +++ b/win/inspircd_win32wrapper.cpp @@ -413,12 +413,12 @@ void ClearConsole() /* Many inspircd classes contain function pointers/functors which can be changed to point at platform specific implementations * of code. This function repoints these pointers and functors so that calls are windows specific. */ -void ChangeWindowsSpecificPointers(InspIRCd* Instance) +void ChangeWindowsSpecificPointers() { Instance->Logs->Log("win32",DEBUG,"Changing to windows specific pointer and functor set"); } -DWORD WindowsForkStart(InspIRCd* Instance) +DWORD WindowsForkStart() { /* Windows implementation of fork() :P */ if (owner_processid) @@ -498,7 +498,7 @@ DWORD WindowsForkStart(InspIRCd* Instance) return ExitCode; } -void WindowsForkKillOwner(InspIRCd * Instance) +void WindowsForkKillOwner() { HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, owner_processid); if(!hProcess || !owner_processid) diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h index 8120e193f..a1eba11e9 100644 --- a/win/inspircd_win32wrapper.h +++ b/win/inspircd_win32wrapper.h @@ -220,7 +220,6 @@ void * ::operator new(size_t iSize); void ::operator delete(void * ptr); /* IPC Handlers */ -class InspIRCd; class ValueItem; class ServerConfig; @@ -230,11 +229,11 @@ CoreExport std::string FindNameServerWin(); /* Clear a windows console */ CoreExport void ClearConsole(); -CoreExport DWORD WindowsForkStart(InspIRCd* Instance); +CoreExport DWORD WindowsForkStart(); -CoreExport void WindowsForkKillOwner(InspIRCd* Instance); +CoreExport void WindowsForkKillOwner(); -CoreExport void ChangeWindowsSpecificPointers(InspIRCd* Instance); +CoreExport void ChangeWindowsSpecificPointers(); CoreExport bool ValidateWindowsDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data); |