diff options
| author | Richard Linden <none@none> | 2012-11-14 23:52:27 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-14 23:52:27 -0800 |
| commit | 9d77e030d9a0d23cebce616631677459eec1612c (patch) | |
| tree | 94b196b2f89c84144ad8eed89c9bbaf6ddb2e558 /indra/llvfs | |
| parent | 67ec47e6da389661934ed2ddfa55ca58455fa7e5 (diff) | |
SH-3406 WIP convert fast timers to lltrace system
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/llpidlock.cpp | 2 | ||||
| -rw-r--r-- | indra/llvfs/llvfile.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llvfs/llpidlock.cpp b/indra/llvfs/llpidlock.cpp index 0424f2379e..3b83d1b9e3 100644 --- a/indra/llvfs/llpidlock.cpp +++ b/indra/llvfs/llpidlock.cpp @@ -36,7 +36,7 @@ #if LL_WINDOWS //For windows platform. -#include <windows.h> +#include "llwin32headerslean.h" namespace { inline DWORD getpid() { diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp index 7f631ef0bb..d3f5673485 100644 --- a/indra/llvfs/llvfile.cpp +++ b/indra/llvfs/llvfile.cpp @@ -32,6 +32,7 @@ #include "llthread.h" #include "llvfs.h" #include "lltimer.h" +#include "llfasttimer.h" const S32 LLVFile::READ = 0x00000001; const S32 LLVFile::WRITE = 0x00000002; |