diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-02-28 12:57:33 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-02-28 12:57:33 +0000 |
| commit | d4baeca441b248de024719f556b681ce868501ae (patch) | |
| tree | 611cfb341c9734bc85aa4a3f2de6322fc9b4c1cb /include | |
| parent | fc673a2c121f524a7ed4101b8b9a0cedf8d6fd58 (diff) | |
| download | mariadb-git-d4baeca441b248de024719f556b681ce868501ae.tar.gz | |
Windows : Fix server compile errors when compile with /Zc:strictStrings option
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/my_global.h b/include/my_global.h index 007c9400ec0..a61fd765995 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1078,10 +1078,9 @@ typedef ulong myf; /* Type of MyFlags in my_funcs */ static inline char *dlerror(void) { static char win_errormsg[2048]; - if(FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, - 0, GetLastError(), 0, win_errormsg, 2048, NULL)) - return win_errormsg; - return ""; + FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, + 0, GetLastError(), 0, win_errormsg, 2048, NULL); + return win_errormsg; } #define HAVE_DLOPEN 1 #define HAVE_DLERROR 1 |