summaryrefslogtreecommitdiff
path: root/indra/llvfs/llpidlock.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llvfs/llpidlock.cpp')
-rw-r--r--[-rwxr-xr-x]indra/llvfs/llpidlock.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/indra/llvfs/llpidlock.cpp b/indra/llvfs/llpidlock.cpp
index 0424f2379e..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();
}
@@ -274,3 +268,8 @@ void LLPidLock::setSaveName(std::string savename)
{
LLPidLockFile::instance().mSaveName=savename;
}
+
+S32 LLPidLock::getPID()
+{
+ return (S32)getpid();
+}