diff options
| author | unknown <brian@avenger.(none)> | 2005-07-11 16:56:18 -0700 |
|---|---|---|
| committer | unknown <brian@avenger.(none)> | 2005-07-11 16:56:18 -0700 |
| commit | 86f46a346e0ee9086ed6a54d6cb73523384284ff (patch) | |
| tree | 54b8d474d580ac1db00af2b18739c2711a13205e /include | |
| parent | b18b97aace1ad49ce4fcb2ad634bc171ce289869 (diff) | |
| download | mariadb-git-86f46a346e0ee9086ed6a54d6cb73523384284ff.tar.gz | |
Fix for gcc 4.0 (they have removed min/max operators).
include/my_global.h:
Fix for gcc 4.0 (they removed min/max)
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 5 |
1 files changed, 1 insertions, 4 deletions
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 |