From b45ad14b788c96130996766e18a03dff1bb8ad8d Mon Sep 17 00:00:00 2001
From: Darryl Pogue <dvpdiner2@gmail.com>
Date: Sat, 28 Jan 2012 18:11:22 -0800
Subject: [PATCH] Fix NxMath conflicts.

---
 Sources/Plasma/CoreLib/hsWindows.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Sources/Plasma/CoreLib/hsWindows.h b/Sources/Plasma/CoreLib/hsWindows.h
index 1fcbd83f..2d716736 100644
--- a/Sources/Plasma/CoreLib/hsWindows.h
+++ b/Sources/Plasma/CoreLib/hsWindows.h
@@ -65,9 +65,26 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #      include <ws2tcpip.h>
 #   endif // MAXPLUGINCODE
 #   define WIN32_LEAN_AND_MEAN
+#   define NOMINMAX // Needed to prevent NxMath conflicts
 #   include <Windows.h>
     
     typedef HWND hsWindowHndl;
+    typedef HINSTANCE hsWindowInst;
 #else
     typedef int32_t* hsWindowHndl;
+    typedef int32_t* hsWindowInst;
 #endif // HS_BUILD_FOR_WIN32
+
+/****************************************************************************
+*
+*   max/min inline functions
+*
+***/
+
+#ifdef max
+#undef max
+#endif
+
+#ifdef min
+#undef min
+#endif