diff options
| author | Adam <Adam@anope.org> | 2012-07-17 22:10:49 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2012-07-17 22:10:49 -0400 |
| commit | 3f5c635c38919396f6f31a5bcea5358314d01f83 (patch) | |
| tree | e0889af4b74834f9c056c81bd676e4c606181ffb | |
| parent | 0e8c46340c2d95239e0f11de510f758bf08cc681 (diff) | |
Fixed Windows build
| -rw-r--r-- | src/commands/cmd_stats.cpp | 4 | ||||
| -rw-r--r-- | win/inspircd.vcxproj | 3 | ||||
| -rw-r--r-- | 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 <ClCompile Include="..\src\socket.cpp" /> <ClCompile Include="..\src\socketengine.cpp" /> <ClCompile Include="..\src\socketengines\socketengine_select.cpp" /> - <ClCompile Include="..\src\stats.cpp" /> <ClCompile Include="..\src\testsuite.cpp" /> <ClCompile Include="..\src\threadengine.cpp" /> <ClCompile Include="..\src\threadengines\threadengine_win32.cpp" /> @@ -390,4 +389,4 @@ nmake -f modules.mak <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> 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<Link> unused_Link; reference<Autoconnect> unused_Autoconnect; reference<ssl_cert> unused_Cert; + reference<OperInfo> 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<Link>(unused_Link); unused_Autoconnect = reference<Autoconnect>(unused_Autoconnect); unused_Cert = reference<ssl_cert>(unused_Cert); + unused_OperInfo = reference<OperInfo>(unused_OperInfo); unused_Link = reference<Link>(l); unused_Autoconnect = reference<Autoconnect>(a); unused_Cert = reference<ssl_cert>(s); + unused_OperInfo = reference<OperInfo>(o); delete unused_Link; delete unused_Autoconnect; delete unused_Cert; + delete unused_OperInfo; } |