diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-01-10 20:16:52 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-01-10 20:25:36 +0000 |
| commit | cdb7a8fa6928f3fb103ed7f66486dc9130a60e89 (patch) | |
| tree | 0ccfcb81cc6766100b4c84839a3991346a19616b | |
| parent | 79fc07471068dfe41d08cd23dff100039949836f (diff) | |
| download | mariadb-git-cdb7a8fa6928f3fb103ed7f66486dc9130a60e89.tar.gz | |
Silence warning coming from Windows' own header dbghelp.h
| -rw-r--r-- | mysql-test/lib/My/SafeProcess/safe_kill_win.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc index bb884cba11e..6ca38ceee81 100644 --- a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc +++ b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc @@ -26,7 +26,20 @@ #include <signal.h> #include <stdlib.h> #include <psapi.h> + +#ifdef _MSC_VER +/* Silence warning in OS header dbghelp.h */ +#pragma warning(push) +#pragma warning(disable : 4091) +#endif + #include <dbghelp.h> + +#ifdef _MSC_VER +/* Silence warning in OS header dbghelp.h */ +#pragma warning(pop) +#endif + #include <tlhelp32.h> #include <vector> |