From f455ee25ecd3e92ca85ca333516aeeeedf4a807a Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Fri, 4 Jan 2013 21:54:22 -0800 Subject: [PATCH] Fixes for UUID compilation on Windows. --- Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h | 1 + .../NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp | 2 +- Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceIo.cpp | 2 +- .../PubUtilLib/plNetClientRecorder/plNetClientRecorder.cpp | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h index 0a81b6cc..4724c7ce 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h @@ -49,6 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for game manager messages // +#include "HeadSpin.h" #include "../pyGlueHelpers.h" #include diff --git a/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp index 91490b37..429f78b2 100644 --- a/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp +++ b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp @@ -489,7 +489,7 @@ static void SocketInitListen ( notify.buildId = 0; notify.buildType = 0; notify.branchId = 0; - notify.productId = 0; + notify.productId = kNilUuid; notify.addr = listenAddr; notify.buffer = sock->opRead.read.buffer; notify.bytes = 0; diff --git a/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceIo.cpp b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceIo.cpp index eb94d2a9..294c774c 100644 --- a/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceIo.cpp +++ b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceIo.cpp @@ -428,6 +428,6 @@ FAsyncNotifySocketProc AsyncSocketFindNotifyProc ( *buildId = 0; *buildType = 0; *branchId = 0; - *productId = 0; + *productId = kNilUuid; return nil; } diff --git a/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientRecorder.cpp b/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientRecorder.cpp index dc43052d..94b7f2cd 100644 --- a/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientRecorder.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientRecorder.cpp @@ -39,6 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ +#include "hsWindows.h" #include "plNetClientRecorder.h" #include "hsStream.h" #include "hsTimer.h"