From 86f46a346e0ee9086ed6a54d6cb73523384284ff Mon Sep 17 00:00:00 2001
From: unknown <brian@avenger.(none)>
Date: Mon, 11 Jul 2005 16:56:18 -0700
Subject: Fix for gcc 4.0 (they have removed min/max operators).

include/my_global.h:
  Fix for gcc 4.0 (they removed min/max)
---
 include/my_global.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/my_global.h b/include/my_global.h
index f2fa54f3e4a..a7e6bba82b6 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -375,10 +375,7 @@ int	__void__;
 #endif
 
 /* Define some useful general macros */
-#if defined(__cplusplus) && defined(__GNUC__)
-#define max(a, b)	((a) >? (b))
-#define min(a, b)	((a) <? (b))
-#elif !defined(max)
+#if !defined(max)
 #define max(a, b)	((a) > (b) ? (a) : (b))
 #define min(a, b)	((a) < (b) ? (a) : (b))
 #endif
-- 
cgit v1.2.1