From afcf8ad536781b07bdabc1c8f4bc4c2f4ba6c3de Mon Sep 17 00:00:00 2001 From: brain Date: Fri, 27 Jul 2007 19:50:42 +0000 Subject: make sure that the pointers are set up correctly for win32 git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7600 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/inspircd.cpp | 1 + win/inspircd_win32wrapper.cpp | 7 ++----- win/inspircd_win32wrapper.h | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/inspircd.cpp b/src/inspircd.cpp index a7a2b1bb6..6d0661fda 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -389,6 +389,7 @@ InspIRCd::InspIRCd(int argc, char** argv) WSADATA wsadata; WSAStartup(MAKEWORD(2,0), &wsadata); + ChangeWindowsSpecificPointers(this); #endif if (!ServerConfig::FileExists(this->ConfigFileName)) { diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp index cc56af69d..1646e39af 100644 --- a/win/inspircd_win32wrapper.cpp +++ b/win/inspircd_win32wrapper.cpp @@ -516,19 +516,16 @@ void ClearConsole() } /* Many inspircd classes contain function pointers/functors which can be changed to point at platform specific implementations - * of code. This function, called from WindowsForkStart, repoints these pointers and functors so that calls are windows - * specific. + * of code. This function repoints these pointers and functors so that calls are windows specific. */ void ChangeWindowsSpecificPointers(InspIRCd* Instance) { + Instance->Log(DEBUG,"Changing to windows specific pointer and functor set"); Instance->Config->DNSServerValidator = &ValidateWindowsDnsServer; } DWORD WindowsForkStart(InspIRCd* Instance) { - /* See the function declaration above */ - ChangeWindowsSpecificPointers(Instance); - /* Windows implementation of fork() :P */ if (owner_processid) return 0; diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h index 0fd43fab8..ffda9ff40 100644 --- a/win/inspircd_win32wrapper.h +++ b/win/inspircd_win32wrapper.h @@ -202,6 +202,8 @@ DWORD WindowsForkStart(InspIRCd* Instance); void WindowsForkKillOwner(InspIRCd* Instance); +void ChangeWindowsSpecificPointers(InspIRCd* Instance); + bool ValidateWindowsDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data); #endif -- cgit v1.2.3