X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..61581d48be4b9b8818d5d743dc12c5e1ca2afd0e:/include/wx/msw/wrapwin.h

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index 04b9d59ed3..72c0d8cd17 100644
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -17,6 +17,11 @@
     #define STRICT 1
 #endif
 
+// don't define min() and max() as macros, they conflict with standard C++ ones
+#ifndef NOMINMAX
+    #define NOMINMAX
+#endif // NOMINMAX
+
 #include <windows.h>
 
 #ifdef __WXWINCE__
@@ -44,6 +49,7 @@
 // with newer SDK headers
 #if !defined(__WIN64__) && !defined(__WXWINCE__)
     #define UINT_PTR unsigned int
+    #define LONG_PTR long
     #define ULONG_PTR unsigned long
     #define DWORD_PTR unsigned long
 #endif // !__WIN64__