diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-02-01 16:40:20 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-02-01 16:40:20 +0100 |
| commit | 91ff0172972fdc3b858d6272b653f70a5650b067 (patch) | |
| tree | 181b1fb38fff3e466167d8431b6c23a77e76a73e /include | |
| parent | a96fbc3c352dad89c6007672eedf437e0516abe0 (diff) | |
| parent | 8cf1f50967ff58abb7d9688ae64ac662e66389c0 (diff) | |
| download | mariadb-git-91ff0172972fdc3b858d6272b653f70a5650b067.tar.gz | |
Merge MDEV-9112 into 10.1
Conflicts:
config.h.cmake
configure.cmake
Diffstat (limited to 'include')
| -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 1bf13fd1903..976ed9850cc 100644 --- a/include/my_context.h +++ b/include/my_context.h @@ -31,7 +31,7 @@ #define MY_CONTEXT_USE_X86_64_GCC_ASM #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) #define MY_CONTEXT_USE_I386_GCC_ASM -#elif defined(HAVE_UCONTEXT) +#elif defined(HAVE_UCONTEXT_H) #define MY_CONTEXT_USE_UCONTEXT #else #define MY_CONTEXT_DISABLE |