From 454e4c8afb79d66b1a6ac02483dd0b7d834321ea Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Sat, 28 Jan 2012 22:32:30 -0800 Subject: [PATCH] Fix some pnUtils header issues. --- Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h | 1 - Sources/Plasma/NucleusLib/pnUtils/pnUtCoreLib.h | 5 ++--- Sources/Plasma/NucleusLib/pnUtils/pnUtPragma.h | 5 ++--- Sources/Plasma/NucleusLib/pnUtils/pnUtils.h | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h index b3b1cffa..6c06150a 100644 --- a/Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h +++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h @@ -70,7 +70,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnUtMisc.h" #include "pnUtCrypt.h" #include "pnUtSpareList.h" -#include "pnUtSubst.h" #include "pnUtRand.h" #include "pnUtBase64.h" #include "pnUtSkipList.h" diff --git a/Sources/Plasma/NucleusLib/pnUtils/pnUtCoreLib.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtCoreLib.h index ff4a66f9..c5437947 100644 --- a/Sources/Plasma/NucleusLib/pnUtils/pnUtCoreLib.h +++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtCoreLib.h @@ -45,9 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com * ***/ -#ifdef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTCORELIB_H -#error "Header $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCoreLib.h included more than once" -#endif +#ifndef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTCORELIB_H #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTCORELIB_H #pragma warning(push, 0) @@ -58,3 +56,4 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #pragma warning(pop) +#endif diff --git a/Sources/Plasma/NucleusLib/pnUtils/pnUtPragma.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtPragma.h index 6b99273e..0d16bcfa 100644 --- a/Sources/Plasma/NucleusLib/pnUtils/pnUtPragma.h +++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtPragma.h @@ -45,11 +45,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com * ***/ -#ifdef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTPRAGMA_H -#error "Header $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPragma.h included more than once" -#endif +#ifndef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTPRAGMA_H #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTPRAGMA_H #pragma warning(disable: 4800) // 'type' : forcing value to bool 'true' or 'false' (performance warning) #pragma warning(disable: 4201) // nonstandard extension used : nameless struct/union +#endif diff --git a/Sources/Plasma/NucleusLib/pnUtils/pnUtils.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtils.h index 7aa14fc2..cb1e601d 100644 --- a/Sources/Plasma/NucleusLib/pnUtils/pnUtils.h +++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtils.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PNUTILS_H -#include "Private/pnUtAllIncludes.h" +#include "pnUtAllIncludes.h" #endif // PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PNUTILS_H