From 72000fd0c12aa2a2025dda8d132250b4112046d9 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Tue, 11 Dec 2012 22:36:58 -0500 Subject: [PATCH] Fixes some oversights. Okay, what moron left out the include guards on hsSTLStream.h? Come on, man. --- Sources/Plasma/CoreLib/hsSTLStream.h | 6 ++++++ Sources/Plasma/NucleusLib/pnUtils/pnUtStr.h | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/Sources/Plasma/CoreLib/hsSTLStream.h b/Sources/Plasma/CoreLib/hsSTLStream.h index 40d8af9c..b4144679 100644 --- a/Sources/Plasma/CoreLib/hsSTLStream.h +++ b/Sources/Plasma/CoreLib/hsSTLStream.h @@ -39,6 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#ifndef _hsSTLStream_h_inc_ +#define _hsSTLStream_h_inc_ + #include "hsStream.h" #include "hsStlUtils.h" @@ -82,3 +86,5 @@ public: // In case you want to try and be efficient with your memory allocations void Reserve(uint32_t bytes) { fVector.reserve(bytes); } }; + +#endif // _hsSTLStream_h_inc_ diff --git a/Sources/Plasma/NucleusLib/pnUtils/pnUtStr.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtStr.h index 949737e9..a7d265ca 100644 --- a/Sources/Plasma/NucleusLib/pnUtils/pnUtStr.h +++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtStr.h @@ -52,6 +52,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnUtArray.h" #include +// Got Damn eap... +// Duplicate Symbols in shlwapi! +#ifdef _INC_SHLWAPI +# undef StrChr +# undef StrDup +# undef StrStr +#endif // _INC_SHLWAPI + /***************************************************************************** * * String functions