diff options
| author | Brandon Nesterenko <brandon.nesterenko@mariadb.com> | 2021-05-11 08:33:56 -0600 |
|---|---|---|
| committer | Brandon Nesterenko <brandon.nesterenko@mariadb.com> | 2021-05-11 08:33:56 -0600 |
| commit | 2f980207c5903312d57e594ba173204c5c826346 (patch) | |
| tree | 62011408eccf81b13c148a4d53ac634fb60ddd12 | |
| parent | 7c1231a6d59edd319fe8a5f3cb5782fc641d9a0a (diff) | |
| download | mariadb-git-bb-10.6-MDEV-14974-v2.tar.gz | |
MDEV-14974: Changed __WIN__ macro to _WIN32bb-10.6-MDEV-14974-v2
| -rw-r--r-- | client/client_priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index 7178c1b7ef0..cd95d235763 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -141,7 +141,7 @@ enum options_client The --socket CLI option has different meanings across different operating systems. */ -#ifndef __WIN__ +#ifndef _WIN32 #define SOCKET_PROTOCOL_TO_FORCE MYSQL_PROTOCOL_SOCKET #else #define SOCKET_PROTOCOL_TO_FORCE MYSQL_PROTOCOL_PIPE @@ -172,7 +172,7 @@ static inline void warn_protocol_override(char *host, const char *protocol_name; if (*opt_protocol == MYSQL_PROTOCOL_DEFAULT -#ifndef __WIN__ +#ifndef _WIN32 && new_protocol == MYSQL_PROTOCOL_SOCKET #else && new_protocol == MYSQL_PROTOCOL_TCP |