diff options
| author | joerg@debian.(none) <> | 2007-06-01 17:43:48 +0200 |
|---|---|---|
| committer | joerg@debian.(none) <> | 2007-06-01 17:43:48 +0200 |
| commit | b953f1b2c137ed6310a3f2af40d1e2b83ab7a90f (patch) | |
| tree | 2e5fa409a7167c29a1ac09573994f7283d33615e /mysys | |
| parent | 81930fc4bf9163b334eec9707fc51127c4d5c718 (diff) | |
| download | mariadb-git-b953f1b2c137ed6310a3f2af40d1e2b83ab7a90f.tar.gz | |
Avoid a compile error which arises from a redefinition of "inline":
If it has been defined (by "configure", in "include/my_config.h"),
then an "#undef" is needed to avoid a redefinition.
This is needed to prevent a compile error of the debug server on AIX.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_keycache.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 4c98882ac7e..473aabe0c01 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -325,6 +325,9 @@ static int keycache_pthread_cond_signal(pthread_cond_t *cond); #endif /* defined(KEYCACHE_DEBUG) */ #if !defined(DBUG_OFF) +#if defined(inline) +#undef inline +#endif #define inline /* disabled inline for easier debugging */ static int fail_block(BLOCK_LINK *block); static int fail_hlink(HASH_LINK *hlink); |