diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-05-07 11:14:26 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-05-07 11:14:26 -0700 |
| commit | 48fece44737fa8b9614fd864354d9287a216ea33 (patch) | |
| tree | f68426d79f4631c6b49be142a92e59086870fa38 /indra/llcrashlogger/llcrashlock.cpp | |
| parent | ae856ef31830912cec0f4de37167858a24e4ba30 (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
Merge with 3.7.7-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; |