Commit 7d5f53e4 authored by unknown's avatar unknown

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.


mysys/mf_keycache.c:
  It may happen, that "include/my_config.h" already contains a
    #define inline ...
  as created by "configure" (this happens on AIX).
  In this case, an "#undef" is needed to avoid a compile error.
parent 62adac58
...@@ -325,6 +325,9 @@ static int keycache_pthread_cond_signal(pthread_cond_t *cond); ...@@ -325,6 +325,9 @@ static int keycache_pthread_cond_signal(pthread_cond_t *cond);
#endif /* defined(KEYCACHE_DEBUG) */ #endif /* defined(KEYCACHE_DEBUG) */
#if !defined(DBUG_OFF) #if !defined(DBUG_OFF)
#if defined(inline)
#undef inline
#endif
#define inline /* disabled inline for easier debugging */ #define inline /* disabled inline for easier debugging */
static int fail_block(BLOCK_LINK *block); static int fail_block(BLOCK_LINK *block);
static int fail_hlink(HASH_LINK *hlink); static int fail_hlink(HASH_LINK *hlink);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment