diff options
| author | Richard Linden <none@none> | 2014-04-07 19:09:40 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-04-07 19:09:40 -0700 |
| commit | 98aabdc176c23de9ba23f902dc2015f9c775d26e (patch) | |
| tree | 5ac6ffdb8e9be8d3c2a2f8b591c9971726c6b73c /indra/llcrashlogger/llcrashlock.cpp | |
| parent | 7e966f28da79d2d24f93a2615c8807421300700c (diff) | |
| parent | e5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (diff) | |
merge with release
Diffstat (limited to 'indra/llcrashlogger/llcrashlock.cpp')
| -rw-r--r-- | indra/llcrashlogger/llcrashlock.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcrashlogger/llcrashlock.cpp b/indra/llcrashlogger/llcrashlock.cpp index c3d2f944fc..f9981c9fa8 100644 --- a/indra/llcrashlogger/llcrashlock.cpp +++ b/indra/llcrashlogger/llcrashlock.cpp @@ -31,7 +31,6 @@ #include "lldir.h" #include "llsd.h" #include "llsdserialize.h" -#include "llnametable.h" #include "llframetimer.h" #include <boost/filesystem.hpp> #include <string> @@ -40,7 +39,7 @@ #if LL_WINDOWS //For windows platform. -#include <windows.h> +#include <llwin32headers.h> #include <TlHelp32.h> namespace { |