summaryrefslogtreecommitdiff
path: root/mysys/stacktrace.c
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2017-03-17 08:56:57 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2017-03-17 08:56:57 +0000
commit66905f6dcbd2103ed1cd9fa459efe2643e7ef560 (patch)
tree430beccfbea2adf0c68aef5c3f0e58830380ac26 /mysys/stacktrace.c
parent7668a79a88a3103781ee23eace53ca3e9bbd6644 (diff)
downloadmariadb-git-66905f6dcbd2103ed1cd9fa459efe2643e7ef560.tar.gz
Fix several compile warnings on Windows
Diffstat (limited to 'mysys/stacktrace.c')
-rw-r--r--mysys/stacktrace.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/mysys/stacktrace.c b/mysys/stacktrace.c
index e22fb4162ec..841a52944df 100644
--- a/mysys/stacktrace.c
+++ b/mysys/stacktrace.c
@@ -483,7 +483,18 @@ void my_write_core(int sig)
#else /* __WIN__*/
+#ifdef _MSC_VER
+/* Silence warning in OS header dbghelp.h */
+#pragma warning(push)
+#pragma warning(disable : 4091)
+#endif
+
#include <dbghelp.h>
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#include <tlhelp32.h>
#include <my_sys.h>
#if _MSC_VER