summaryrefslogtreecommitdiff
path: root/indra/llvfs/llpidlock.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-05-13 10:02:26 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-05-13 10:02:26 -0400
commit7b9708a2e3aede6faef04bd546c497dc68264f58 (patch)
treec49b3779d7a1f2e94fa1d33396c882e3351a4797 /indra/llvfs/llpidlock.cpp
parentd0eb9658f2698b9c200991e84c1a60be48788e2c (diff)
parentd0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff)
sunshine-external merge WIP
Diffstat (limited to 'indra/llvfs/llpidlock.cpp')
-rw-r--r--[-rwxr-xr-x]indra/llvfs/llpidlock.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/llvfs/llpidlock.cpp b/indra/llvfs/llpidlock.cpp
index b5fd3673a6..e64368e8d7 100755..100644
--- a/indra/llvfs/llpidlock.cpp
+++ b/indra/llvfs/llpidlock.cpp
@@ -38,12 +38,6 @@
#include <windows.h>
-namespace {
- inline DWORD getpid() {
- return GetCurrentProcessId();
- }
-}
-
bool isProcessAlive(U32 pid)
{
return (bool) GetProcessVersion((DWORD)pid);
@@ -105,7 +99,7 @@ void LLPidLockFile::writeLockFile(LLSD pids)
if (!LLSDSerialize::toXML(pids,ofile))
{
- llwarns << "Unable to write concurrent save lock file." << llendl;
+ LL_WARNS() << "Unable to write concurrent save lock file." << LL_ENDL;
}
ofile.close();
}