From a28213806f9263b5181124be2a4835b0ff749b3b Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Sat, 10 Mar 2012 19:16:52 -0800 Subject: [PATCH] Fix compiling. --- Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp | 4 ++-- Sources/Plasma/Apps/plUruLauncher/Main.cpp | 1 + Sources/Plasma/CoreLib/hsUtils.h | 4 ++-- .../Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNt.cpp | 2 -- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp b/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp index 54d2430f..b8beaf9b 100644 --- a/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp +++ b/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp @@ -350,7 +350,7 @@ static void RequestNextManifestFile () { if (!manifestQueue.size()) return; - ManifestFile* nextFile = manifestQueue.front(); + ManifestFile* nextfile = manifestQueue.front(); manifestQueue.pop(); char path[MAX_PATH]; @@ -920,7 +920,7 @@ void UruPrepProc (void * param) { while (manifestQueue.size()) { - ManifestFile* mf = manifestQueue.front() + ManifestFile* mf = manifestQueue.front(); manifestQueue.pop(); delete mf; } diff --git a/Sources/Plasma/Apps/plUruLauncher/Main.cpp b/Sources/Plasma/Apps/plUruLauncher/Main.cpp index 8e2d15c6..2c41a352 100644 --- a/Sources/Plasma/Apps/plUruLauncher/Main.cpp +++ b/Sources/Plasma/Apps/plUruLauncher/Main.cpp @@ -46,6 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ***/ #include "Pch.h" +#include "hsThread.h" #pragma hdrstop diff --git a/Sources/Plasma/CoreLib/hsUtils.h b/Sources/Plasma/CoreLib/hsUtils.h index e42179af..4768d57d 100644 --- a/Sources/Plasma/CoreLib/hsUtils.h +++ b/Sources/Plasma/CoreLib/hsUtils.h @@ -258,7 +258,7 @@ void DebugMsg(const char fmt[], ...); ***/ // *value += increment; return original value of *value; thread safe -long AtomicAdd(long* value, long increment) { +inline long AtomicAdd(long* value, long increment) { #ifdef HS_BUILD_FOR_WIN32 return InterlockedExchangeAdd(value, increment); #elif HS_BUILD_FOR_UNIX @@ -269,7 +269,7 @@ long AtomicAdd(long* value, long increment) { } // *value = value; return original value of *value; thread safe -long AtomicSet(long* value, long set) { +inline long AtomicSet(long* value, long set) { #ifdef HS_BUILD_FOR_WIN32 return InterlockedExchange(value, set); #elif HS_BUILD_FOR_UNIX diff --git a/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNt.cpp b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNt.cpp index 8e9dbd18..1475ede2 100644 --- a/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNt.cpp +++ b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNt.cpp @@ -222,8 +222,6 @@ static void INtOpDispatch ( //=========================================================================== static unsigned THREADCALL NtWorkerThreadProc (AsyncThread * thread) { - ThreadDenyBlock(); - unsigned sleepMs = INFINITE; while (s_running) {