[ros-diffs] [hpoussin] 23153: Fix headers, so MSVC can use them

Author: hpoussin
Date: Tue Jul 18 19:30:22 2006
New Revision: 23153

URL: http://svn.reactos.org/svn/reactos?rev=23153&view=rev
Log:
Fix headers, so MSVC can use them

Modified:
    trunk/reactos/include/crt/excpt.h
    trunk/reactos/include/psdk/windef.h

Modified: trunk/reactos/include/crt/excpt.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/excpt.h?rev=23…
==============================================================================
--- trunk/reactos/include/crt/excpt.h (original)
+++ trunk/reactos/include/crt/excpt.h Tue Jul 18 19:30:22 2006
@@ -56,6 +56,8 @@
  * The type of function that is expected as an exception handler to be
  * installed with _try1.
  */
+struct _CONTEXT;
+struct _EXCEPTION_RECORD;
 typedef EXCEPTION_DISPOSITION (*PEXCEPTION_HANDLER)
 		(struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*);
 

Modified: trunk/reactos/include/psdk/windef.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=…
==============================================================================
--- trunk/reactos/include/psdk/windef.h (original)
+++ trunk/reactos/include/psdk/windef.h Tue Jul 18 19:30:22 2006
@@ -137,13 +137,21 @@
 #endif
 #endif
 
-#ifndef NOMINMAX
+#if defined(_MSC_VER) && defined(__cplusplus)
+
+#include <stdlib.h>
+#define min __min
+#define max __max
+
+#elif !defined(NOMINMAX)
+
 #ifndef max
 #define max(a,b) ((a)>(b)?(a):(b))
 #endif
 #ifndef min
 #define min(a,b) ((a)<(b)?(a):(b))
 #endif
+
 #endif
 
 #define UNREFERENCED_PARAMETER(P) {(P)=(P);}