diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-06-06 13:21:03 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-06-06 13:21:03 +0200 |
| commit | 3d6eb7afcfb47cb432f790d0b25c8c1f4ec5bcf3 (patch) | |
| tree | 0915add6039e740b9ab08baf215e435480c44526 /mysys/string.c | |
| parent | 06dd151bb86ad5b87d4d46011f36da1289c01074 (diff) | |
| download | mariadb-git-3d6eb7afcfb47cb432f790d0b25c8c1f4ec5bcf3.tar.gz | |
MDEV-25602 get rid of __WIN__ in favor of standard _WIN32
This fixed the MySQL bug# 20338 about misuse of double underscore
prefix __WIN__, which was old MySQL's idea of identifying Windows
Replace it by _WIN32 standard symbol for targeting Windows OS
(both 32 and 64 bit)
Not that connect storage engine is not fixed in this patch (must be
fixed in "upstream" branch)
Diffstat (limited to 'mysys/string.c')
| -rw-r--r-- | mysys/string.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/string.c b/mysys/string.c index b346393d91e..91e4306ced4 100644 --- a/mysys/string.c +++ b/mysys/string.c @@ -145,13 +145,13 @@ my_bool dynstr_trunc(DYNAMIC_STRING *str, size_t n) my_bool dynstr_append_os_quoted(DYNAMIC_STRING *str, const char *append, ...) { -#ifdef __WIN__ +#ifdef _WIN32 LEX_CSTRING quote= { C_STRING_WITH_LEN("\"") }; LEX_CSTRING replace= { C_STRING_WITH_LEN("\\\"") }; #else LEX_CSTRING quote= { C_STRING_WITH_LEN("\'") }; LEX_CSTRING replace= { C_STRING_WITH_LEN("'\"'\"'") }; -#endif /* __WIN__ */ +#endif /* _WIN32 */ my_bool ret= TRUE; va_list dirty_text; |