From ff0e9e4c2ad497e820e407d29be84732a322de78 Mon Sep 17 00:00:00 2001
From: Stas Degteff <stas_degteff@users.sourceforge.net>
Date: Wed, 10 Aug 2005 10:37:14 +0000
Subject: [PATCH] Fix gcc 4.0 build, part two. Patch from Max Alekseyev
 <relf@os2.ru>

---
 goldlib/gall/gdefs.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/goldlib/gall/gdefs.h b/goldlib/gall/gdefs.h
index 8f1c421..135585d 100644
--- a/goldlib/gall/gdefs.h
+++ b/goldlib/gall/gdefs.h
@@ -118,13 +118,8 @@ typedef int (*StdCmpCP)(const void*, const void*);
 template <class T> inline bool in_range(T a, T b, T c)   { return (a >= b) and (a <= c); }
 template <class T> inline    T absolute(T a)             { return a < 0 ? -a : a; }
 template <class T> inline  int compare_two(T a, T b)     { return a < b ? -1 : a > b ? 1 : 0; }
-#ifdef __GNUC__
-template <class T> inline    T minimum_of_two(T a, T b)  { return __extension__ (a <? b); }
-template <class T> inline    T maximum_of_two(T a, T b)  { return __extension__ (a >? b); }
-#else
 template <class T> inline    T minimum_of_two(T a, T b)  { return (a < b) ? a : b; }
 template <class T> inline    T maximum_of_two(T a, T b)  { return (a > b) ? a : b; }
-#endif
 template <class T> inline  int zero_or_one(T e)          { return e ? 1 : 0; }
 template <class T> inline bool make_bool(T a)            { return a ? true : false; }