diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-12-27 19:24:05 +0200 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-12-27 19:24:05 +0200 |
| commit | 18e211279de4c7e56d162a8a50b11cd83b5c1650 (patch) | |
| tree | cedcd58bbc7f680f9bd46ca8b34d3c16f2da3869 /config.h.cmake | |
| parent | 85d668b45ccb1b71a31ab924a6ce82b725899f86 (diff) | |
| parent | 26763a57a305e99090fdbc0666a4f755835e6921 (diff) | |
| download | mariadb-git-18e211279de4c7e56d162a8a50b11cd83b5c1650.tar.gz | |
Merge mysql-5.5-bugteam -> mysql-5.5-innodb
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 de1f0a65db7..fc582da337f 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -226,6 +226,7 @@ #cmakedefine HAVE_PTHREAD_THREADMASK 1 #cmakedefine HAVE_PTHREAD_YIELD_NP 1 #cmakedefine HAVE_PTHREAD_YIELD_ZERO_ARG 1 +#cmakedefine PTHREAD_ONCE_INITIALIZER @PTHREAD_ONCE_INITIALIZER@ #cmakedefine HAVE_PUTENV 1 #cmakedefine HAVE_RE_COMP 1 #cmakedefine HAVE_REGCOMP 1 @@ -406,7 +407,6 @@ #cmakedefine TARGET_OS_LINUX 1 -#cmakedefine TARGET_OS_SOLARIS 1 #cmakedefine HAVE_WCTYPE_H 1 #cmakedefine HAVE_WCHAR_H 1 |