diff options
| author | unknown <istruewing@chilla.local> | 2007-02-01 08:09:36 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-02-01 08:09:36 +0100 |
| commit | 62fdcb54a7e03282b19b8661e0f78e766e3b2a36 (patch) | |
| tree | 048257cd44bd6d69572262aba31071a54e7992f1 /include/my_global.h | |
| parent | a94b1b50772271e1e4e72ddb237eff458380c0fa (diff) | |
| parent | 7be3cad45d0dccb3538fe797c9ac81358f92f691 (diff) | |
| download | mariadb-git-62fdcb54a7e03282b19b8661e0f78e766e3b2a36.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.0-axmrg
into chilla.local:/home/mydev/mysql-4.1-axmrg
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/thr_alarm.h:
Auto merged
mysys/default.c:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/thr_alarm.c:
Auto merged
mysys/my_thr_init.c:
Manual merged
sql/mysqld.cc:
Manual merged
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 |