diff options
Diffstat (limited to 'include/my_global.h')
| -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 bd54ba1cf89..b7b200fdcf4 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -415,10 +415,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 |