From dd5e574747ec76f8ea1675bc7cdadb874086aa69 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Tue, 18 May 2010 14:52:01 -0500 Subject: [PATCH] Duplicate max/min def --- src/wxxt/src/XWidgets/xwCommonP.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/wxxt/src/XWidgets/xwCommonP.h b/src/wxxt/src/XWidgets/xwCommonP.h index ee14bd91bd..cad2d7eb24 100644 --- a/src/wxxt/src/XWidgets/xwCommonP.h +++ b/src/wxxt/src/XWidgets/xwCommonP.h @@ -6,11 +6,12 @@ #include #include <./xwCommon.h> _XFUNCPROTOBEGIN +#ifndef max #define max(a, b) ((a )>(b )?(a ):(b )) - - +#endif +#ifndef min #define min(a, b) ((a )<(b )?(a ):(b )) - +#endif typedef void (*compute_inside_Proc)( #if NeedFunctionPrototypes