diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-11-03 12:28:51 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-11-03 12:28:51 +0100 |
| commit | 40e94a3734b1daa254810c4be64e17b84dbbc2a2 (patch) | |
| tree | 5e14dfc106276445caf85dc76c8034c8b0df11b4 /include/my_context.h | |
| parent | 247e654fa7e04dd0c5181c2241470f56749d2a99 (diff) | |
| parent | 4ffc9c3b01459a2904a7154a6c750d128864fc7b (diff) | |
| download | mariadb-git-40e94a3734b1daa254810c4be64e17b84dbbc2a2.tar.gz | |
merge with 5.5
Diffstat (limited to 'include/my_context.h')
| -rw-r--r-- | include/my_context.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_context.h b/include/my_context.h index 3438ce4c969..0abf49efd43 100644 --- a/include/my_context.h +++ b/include/my_context.h @@ -29,7 +29,7 @@ #define MY_CONTEXT_USE_WIN32_FIBERS 1 #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) #define MY_CONTEXT_USE_X86_64_GCC_ASM -#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) && !defined(SAFEMALLOC) +#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) #define MY_CONTEXT_USE_I386_GCC_ASM #else #define MY_CONTEXT_USE_UCONTEXT |