1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

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)
This commit is contained in:
Vladislav Vaintroub
2021-06-06 13:21:03 +02:00
parent 06dd151bb8
commit 3d6eb7afcf
132 changed files with 303 additions and 379 deletions

View File

@@ -233,7 +233,7 @@ static int run_command(char* cmd, const char *mode)
}
#ifdef __WIN__
#ifdef _WIN32
/**
Check to see if there are spaces in a path.
@@ -329,7 +329,7 @@ static int get_default_values()
if ((error= make_tempfile(defaults_file, "txt")))
goto exit;
#ifdef __WIN__
#ifdef _WIN32
{
char *format_str= 0;
@@ -860,7 +860,7 @@ static int process_options(int argc, char *argv[], char *operation)
memset(buff, 0, sizeof(buff));
strncpy(buff, opt_basedir, sizeof(buff) - 1);
#ifdef __WIN__
#ifdef _WIN32
strncat(buff, "/", sizeof(buff) - strlen(buff) - 1);
#else
strncat(buff, FN_DIRSEP, sizeof(buff) - strlen(buff) - 1);
@@ -1175,7 +1175,7 @@ static int bootstrap_server(char *server_path, char *bootstrap_file)
char bootstrap_cmd[FN_REFLEN];
int error= 0;
#ifdef __WIN__
#ifdef _WIN32
char *format_str= 0;
const char *verbose_str= NULL;