diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-05-07 09:31:20 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-05-07 09:31:20 -0700 |
| commit | fbe10b8ee0537c71f2119142f4e0da1bd69d1a53 (patch) | |
| tree | b5ac3f23c9fbd7dba299cd7aa2e8e4f812df98f6 /indra/llcrashlogger/llcrashlock.cpp | |
| parent | 1953c569a6acfd731af2c459da7a6928be4aaf5b (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
Merge with viewer-release
Diffstat (limited to 'indra/llcrashlogger/llcrashlock.cpp')
| -rw-r--r-- | indra/llcrashlogger/llcrashlock.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/llcrashlogger/llcrashlock.cpp b/indra/llcrashlogger/llcrashlock.cpp index c3d2f944fc..7fd7860707 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,15 +39,9 @@ #if LL_WINDOWS //For windows platform. -#include <windows.h> +#include <llwin32headers.h> #include <TlHelp32.h> -namespace { - inline DWORD getpid() { - return GetCurrentProcessId(); - } -} - bool LLCrashLock::isProcessAlive(U32 pid, const std::string& pname) { std::wstring wpname; |