diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-01-22 03:33:59 +0200 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-01-22 03:33:59 +0200 |
| commit | 077840fa23d65e1eb60fdd601802b151ff4b54b4 (patch) | |
| tree | 2c5744d9e9cf04714fcd0fe9214cfb40b2656b74 /include/my_global.h | |
| parent | 4fda992bff2034ff551d30cb5da742184ff4a3df (diff) | |
| parent | 454c763c6be44b34c8e1ff9b8561ab21e717b742 (diff) | |
| download | mariadb-git-077840fa23d65e1eb60fdd601802b151ff4b54b4.tar.gz | |
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
include/thr_alarm.h:
Auto merged
mysys/my_pthread.c:
Auto merged
BUILD/SETUP.sh:
Merged from 4.0
configure.in:
Merged from 4.0
include/my_global.h:
Merged from 4.0
include/my_pthread.h:
Merged from 4.0
mysys/thr_alarm.c:
Merged from 4.0
sql/mysqld.cc:
Merged from 4.0
BUILD/SETUP.sh.rej:
Merged from 4.0
configure.in.rej:
Merged from 4.0
include/my_global.h.rej:
Merged from 4.0
include/my_pthread.h.rej:
Merged from 4.0
mysys/thr_alarm.c.rej:
Merged from 4.0
sql/mysqld.cc.rej:
Merged from 4.0
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index 2de54e521b5..bd54ba1cf89 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -138,7 +138,7 @@ /* Fix problem with S_ISLNK() on Linux */ -#if defined(TARGET_OS_LINUX) +#if defined(TARGET_OS_LINUX) || defined(__GLIBC__) #undef _GNU_SOURCE #define _GNU_SOURCE 1 #endif @@ -415,7 +415,10 @@ int __void__; #endif /* Define some useful general macros */ -#if !defined(max) +#if defined(__cplusplus) && defined(__GNUC__) +#define max(a, b) ((a) >? (b)) +#define min(a, b) ((a) <? (b)) +#elif !defined(max) #define max(a, b) ((a) > (b) ? (a) : (b)) #define min(a, b) ((a) < (b) ? (a) : (b)) #endif |