Merge branch 'pnUtils_must_die' into mingw

13 years ago · bf09905db4
3 changed files with 4 additions and 3 deletions
--- a/Sources/Plasma/PubUtilLib/plGLight/plPerspDirSlave.cpp
+++ b/Sources/Plasma/PubUtilLib/plGLight/plPerspDirSlave.cpp
@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <float.h>
 #include <math.h>

-#ifdef _MSC_VER
+#ifdef HS_BUILD_FOR_WIN32
 #define isnan _isnan
 #endif

--- a/Sources/Plasma/PubUtilLib/plGLight/plShadowSlave.cpp
+++ b/Sources/Plasma/PubUtilLib/plGLight/plShadowSlave.cpp
@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <float.h>
 #include <math.h>

-#ifdef _MSC_VER
+#ifdef HS_BUILD_FOR_WIN32
 #define isnan _isnan
 #endif

--- a/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.h
+++ b/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.h
@ -49,9 +49,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define plNetCommMsgs_inc


-#include "pnUtils/pnUtArray.h"
+#include "pnUtils/pnUtils.h"
 #include "pnNetBase/pnNetBase.h"
 #include "pnMessage/plMessage.h"
+#include "pnNetProtocol/pnNetProtocol.h"

 class plNetCommReplyMsg : public plMessage {
 public: