From 908ab6d6326cefbd01ebe30a90fd147381f35919 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Sun, 29 Jan 2012 01:44:23 -0800 Subject: [PATCH] Fix pnUtilsExe. --- Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h | 2 -- Sources/Plasma/NucleusLib/pnUtilsExe/Private/pnUteTls.cpp | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h index 8e167f45..96305333 100644 --- a/Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h +++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h @@ -61,9 +61,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnUtPriQ.h" #include "pnUtSync.h" #include "pnUtTime.h" -#if HS_BUILD_FOR_WIN32 #include "pnUtTls.h" -#endif #include "pnUtStr.h" #include "pnUtRef.h" #include "pnUtPath.h" diff --git a/Sources/Plasma/NucleusLib/pnUtilsExe/Private/pnUteTls.cpp b/Sources/Plasma/NucleusLib/pnUtilsExe/Private/pnUteTls.cpp index a2354b39..4001806b 100644 --- a/Sources/Plasma/NucleusLib/pnUtilsExe/Private/pnUteTls.cpp +++ b/Sources/Plasma/NucleusLib/pnUtilsExe/Private/pnUteTls.cpp @@ -48,6 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "../Pch.h" #pragma hdrstop +#if HS_BUILD_FOR_WIN32 /***************************************************************************** * @@ -105,3 +106,5 @@ void ThreadAssertCanBlock (const char file[], int line) { if (ThreadLocalGetValue(s_tlsNoBlock)) ErrorAssert(line, file, "This thread may not block"); } + +#endif