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 /config.h.cmake | |
| 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 '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 4030673057f..ce6f14723b8 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -96,6 +96,7 @@ #cmakedefine HAVE_SYS_UN_H 1 #cmakedefine HAVE_SYS_VADVISE_H 1 #cmakedefine HAVE_SYS_STATVFS_H 1 +#cmakedefine HAVE_UCONTEXT_H 1 #cmakedefine HAVE_TERM_H 1 #cmakedefine HAVE_TERMBITS_H 1 #cmakedefine HAVE_TERMIOS_H 1 @@ -297,7 +298,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 |