From 3f5c635c38919396f6f31a5bcea5358314d01f83 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 17 Jul 2012 22:10:49 -0400 Subject: Fixed Windows build --- src/commands/cmd_stats.cpp | 4 ++++ win/inspircd.vcxproj | 3 +-- win/inspircd_win32wrapper.cpp | 7 +++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/commands/cmd_stats.cpp b/src/commands/cmd_stats.cpp index 6b21d0db6..3b0507175 100644 --- a/src/commands/cmd_stats.cpp +++ b/src/commands/cmd_stats.cpp @@ -23,6 +23,10 @@ #include "xline.h" #include "commands/cmd_whowas.h" +#ifdef WINDOWS +# pragma comment(lib, "psapi.lib") // For GetProcessMemoryInfo() +#endif + /** Handle /STATS. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work * the same way, however, they can be fully unloaded, where these diff --git a/win/inspircd.vcxproj b/win/inspircd.vcxproj index 03bacaad3..d6da89562 100644 --- a/win/inspircd.vcxproj +++ b/win/inspircd.vcxproj @@ -308,7 +308,6 @@ nmake -f modules.mak - @@ -390,4 +389,4 @@ nmake -f modules.mak - \ No newline at end of file + diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp index 43ca87240..ec4e7833b 100644 --- a/win/inspircd_win32wrapper.cpp +++ b/win/inspircd_win32wrapper.cpp @@ -738,6 +738,7 @@ static void unused_function() reference unused_Link; reference unused_Autoconnect; reference unused_Cert; + reference unused_OperInfo; if (unused_Link) unused_Link->Port = -1; @@ -745,20 +746,26 @@ static void unused_function() unused_Autoconnect->NextConnectTime = -1; if (unused_Cert) unused_Cert->dn = ""; + if (unused_OperInfo) + unused_OperInfo->name = ""; Autoconnect *a = unused_Autoconnect; Link *l = unused_Link; ssl_cert *s = unused_Cert; + OperInfo *o = unused_OperInfo; unused_Link = reference(unused_Link); unused_Autoconnect = reference(unused_Autoconnect); unused_Cert = reference(unused_Cert); + unused_OperInfo = reference(unused_OperInfo); unused_Link = reference(l); unused_Autoconnect = reference(a); unused_Cert = reference(s); + unused_OperInfo = reference(o); delete unused_Link; delete unused_Autoconnect; delete unused_Cert; + delete unused_OperInfo; } -- cgit v1.2.3