summaryrefslogtreecommitdiff
path: root/config.h.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 /config.h.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 'config.h.cmake')
-rw-r--r--config.h.cmake4
1 files changed, 1 insertions, 3 deletions
diff --git a/config.h.cmake b/config.h.cmake
index 8da37135cc1..c3ff6be90e4 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -502,9 +502,7 @@
# define HAVE_SETENV
#define setenv(a,b,c) _putenv_s(a,b)
#endif
-
-
-
+#define PSAPI_VERSION 1 /* for GetProcessMemoryInfo() */
/*
MySQL features