diff options
| author | unknown <mskold@mysql.com> | 2005-07-12 10:57:01 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-07-12 10:57:01 +0200 |
| commit | 15ff7fd8389eb4adc702b22e1a7b3a23a7845485 (patch) | |
| tree | a0cb143aa089d65489be484595c7f1189db6d4e2 /include | |
| parent | 4c99c0e7db4ef394b9033eda45efc88e988bff10 (diff) | |
| parent | c9956b6a2ac57859677be4755bf418f534e1dd74 (diff) | |
| download | mariadb-git-15ff7fd8389eb4adc702b22e1a7b3a23a7845485.tar.gz | |
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
include/my_global.h:
Auto merged
mysql-test/t/ndb_autodiscover.test:
Auto merged
mysql-test/r/ndb_autodiscover.result:
Merge
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 ec4c52b6ee4..bb1ab71fa70 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -396,10 +396,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 |