diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-02-01 16:29:00 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-02-01 16:29:00 +0100 |
| commit | 955126e31d091a8588f1b6f23506c5d63a644904 (patch) | |
| tree | ba76de07c0c6f92eef71b62a587ab5b503710560 /include/my_context.h | |
| parent | a4ff37e912ee50d2ccee7fa50a361f9990ac78b4 (diff) | |
| parent | 8cf1f50967ff58abb7d9688ae64ac662e66389c0 (diff) | |
| download | mariadb-git-955126e31d091a8588f1b6f23506c5d63a644904.tar.gz | |
Merge MDEV-9112 into 10.0
Conflicts:
configure.cmake
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 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 |