diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-01-17 11:38:34 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-01-17 11:38:34 +0200 |
| commit | a72f7ee6a3717f21b7156a5a3dd2d4b034564b4e (patch) | |
| tree | d95e883cec12b1b4249fca3058a027d51f209014 /include | |
| parent | cc76953cde41e9795b92498fe674ee7eab998b00 (diff) | |
| parent | 10543a4a2eb68ecb618936b57d62c6ca1f7eb6bb (diff) | |
| download | mariadb-git-a72f7ee6a3717f21b7156a5a3dd2d4b034564b4e.tar.gz | |
merged bug #11754014
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/include/my_global.h b/include/my_global.h index 924c83cd951..11ff377c706 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1364,11 +1364,31 @@ do { doubleget_union _tmp; \ #ifndef HAVE_DLERROR #ifdef _WIN32 +#define DLERROR_GENERATE(errmsg, error_number) \ + char win_errormsg[2048]; \ + if(FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, \ + 0, error_number, 0, win_errormsg, 2048, NULL)) \ + { \ + char *ptr; \ + for (ptr= &win_errormsg[0] + strlen(win_errormsg) - 1; \ + ptr >= &win_errormsg[0] && strchr("\r\n\t\0x20", *ptr); \ + ptr--) \ + *ptr= 0; \ + errmsg= win_errormsg; \ + } \ + else \ + errmsg= "" #define dlerror() "" -#else +#define dlopen_errno GetLastError() +#else /* _WIN32 */ #define dlerror() "No support for dynamic loading (static build?)" -#endif -#endif +#define DLERROR_GENERATE(errmsg, error_number) errmsg= dlerror() +#define dlopen_errno errno +#endif /* _WIN32 */ +#else /* HAVE_DLERROR */ +#define DLERROR_GENERATE(errmsg, error_number) errmsg= dlerror() +#define dlopen_errno errno +#endif /* HAVE_DLERROR */ /* |