diff options
| author | Adam <adam@sigterm.info> | 2012-10-12 14:50:05 -0700 |
|---|---|---|
| committer | Adam <adam@sigterm.info> | 2012-10-12 14:50:05 -0700 |
| commit | c05ad37bfd03486475889485606ed5cffc7bf5a2 (patch) | |
| tree | fe01825889769500a0f080371a0714aa15505b9a /include/inspircd.h | |
| parent | e496d321efe3e9b27f2f116bd22a05ec44aec564 (diff) | |
| parent | 5b9682275e384635a1fd9f7320cf4d9a604a43b4 (diff) | |
Merge pull request #320 from ChrisTX/insp20+cleanupwin
Windows: In-depth cleanup (see details)
Diffstat (limited to 'include/inspircd.h')
| -rw-r--r-- | include/inspircd.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/include/inspircd.h b/include/inspircd.h index c06a28043..cc627ca57 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -31,7 +31,7 @@ #define _LARGEFILE_SOURCE #endif -#ifndef WIN32 +#ifndef _WIN32 #define DllExport #define CoreExport #define printf_c printf @@ -55,7 +55,7 @@ #include <cstring> #include <climits> #include <cstdio> -#ifndef WIN32 +#ifndef _WIN32 #include <unistd.h> #endif @@ -232,12 +232,24 @@ class serverstats /** Total bytes of data received */ unsigned long statsRecv; +#ifdef _WIN32 + /** Cpu usage at last sample + */ + FILETIME LastCPU; + /** Time QP sample was read + */ + LARGE_INTEGER LastSampled; + /** QP frequency + */ + LARGE_INTEGER QPFrequency; +#else /** Cpu usage at last sample */ timeval LastCPU; /** Time last sample was read */ timespec LastSampled; +#endif /** The constructor initializes all the counts to zero */ serverstats() @@ -308,10 +320,6 @@ class CoreExport InspIRCd */ char ReadBuffer[65535]; -#ifdef WIN32 - IPC* WindowsIPC; -#endif - public: /** Global cull list, will be processed on next iteration |