Browse Source

Fix compiling.

Darryl Pogue 13 years ago
parent
commit
a28213806f
  1. 4
      Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp
  2. 1
      Sources/Plasma/Apps/plUruLauncher/Main.cpp
  3. 4
      Sources/Plasma/CoreLib/hsUtils.h
  4. 2
      Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNt.cpp

4
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;
}

1
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

4
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

2
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) {

Loading…
Cancel
Save