From 3dd1713e53c4803f75eb1abb53c44fa32408fd90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Tue, 18 Jul 2006 15:30:22 +0000 Subject: [PATCH] Fix headers, so MSVC can use them svn path=/trunk/; revision=23153 --- reactos/include/crt/excpt.h | 2 ++ reactos/include/psdk/windef.h | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/reactos/include/crt/excpt.h b/reactos/include/crt/excpt.h index 967b067a6d0..30ba11404bd 100644 --- a/reactos/include/crt/excpt.h +++ b/reactos/include/crt/excpt.h @@ -56,6 +56,8 @@ extern "C" { * 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*); diff --git a/reactos/include/psdk/windef.h b/reactos/include/psdk/windef.h index 40e11191aed..3d431537f97 100644 --- a/reactos/include/psdk/windef.h +++ b/reactos/include/psdk/windef.h @@ -137,13 +137,21 @@ extern "C" { #endif #endif -#ifndef NOMINMAX +#if defined(_MSC_VER) && defined(__cplusplus) + +#include +#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);}