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 /config.h.cmake | |
| parent | a4ff37e912ee50d2ccee7fa50a361f9990ac78b4 (diff) | |
| parent | 8cf1f50967ff58abb7d9688ae64ac662e66389c0 (diff) | |
| download | mariadb-git-955126e31d091a8588f1b6f23506c5d63a644904.tar.gz | |
Merge MDEV-9112 into 10.0
Conflicts:
configure.cmake
Diffstat (limited to 'config.h.cmake')
| -rw-r--r-- | config.h.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.h.cmake b/config.h.cmake index c7bdfbb250c..1fd1341f1d1 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -93,6 +93,7 @@ #cmakedefine HAVE_SYS_TYPES_H 1 #cmakedefine HAVE_SYS_UN_H 1 #cmakedefine HAVE_SYS_VADVISE_H 1 +#cmakedefine HAVE_UCONTEXT_H 1 #cmakedefine HAVE_TERM_H 1 #cmakedefine HAVE_TERMBITS_H 1 #cmakedefine HAVE_TERMIOS_H 1 @@ -289,7 +290,6 @@ #cmakedefine HAVE_THR_YIELD 1 #cmakedefine HAVE_TIME 1 #cmakedefine HAVE_TIMES 1 -#cmakedefine HAVE_UCONTEXT 1 #cmakedefine HAVE_VALLOC 1 #cmakedefine HAVE_VIDATTR 1 #define HAVE_VIO_READ_BUFF 1 |