summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-11-27 17:50:08 +0100
committerSergei Golubchik <sergii@pisem.net>2011-11-27 17:50:08 +0100
commitdfc1901e806bdda129b8943585f2ccfc8c207322 (patch)
tree5f04d49beb42adafd5fb860d62831e5f3b3c643d /cmake
parenteffed09bd7d8081704eaa017060da84c32e3bf29 (diff)
downloadmariadb-git-dfc1901e806bdda129b8943585f2ccfc8c207322.tar.gz
compilation fixes
cmake/maintainer.cmake: don't do -Werror just yet config.h.cmake: according to MSDN PSAPI_VERSION should be 1 in a portable application mysys/my_thr_init.c: first, reset THR_KEY_mysys, and then free dbug data, because dbug data are automacially created on the next dbug call, unless THR_KEY_mysys is null.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/maintainer.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/maintainer.cmake b/cmake/maintainer.cmake
index a91905a281b..357fbd97263 100644
--- a/cmake/maintainer.cmake
+++ b/cmake/maintainer.cmake
@@ -18,7 +18,7 @@ INCLUDE(CheckCCompilerFlag)
# Setup GCC (GNU C compiler) warning options.
MACRO(SET_MYSQL_MAINTAINER_GNU_C_OPTIONS)
SET(MY_MAINTAINER_WARNINGS
- "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror")
+ "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing")
CHECK_C_COMPILER_FLAG("-Wdeclaration-after-statement"
HAVE_DECLARATION_AFTER_STATEMENT)
IF(HAVE_DECLARATION_AFTER_STATEMENT)