diff options
Diffstat (limited to 'client/mysqlslap.c')
-rw-r--r-- | client/mysqlslap.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c index f456d9b1841..555f0624c7e 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -86,16 +86,15 @@ TODO: #include <my_dir.h> #include <signal.h> #include <sslopt-vars.h> -#ifndef __WIN__ +#ifndef _WIN32 #include <sys/wait.h> #endif #include <ctype.h> #include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */ -#ifdef __WIN__ +#ifdef _WIN32 #define srandom srand #define random rand -#define snprintf _snprintf #endif @@ -282,7 +281,7 @@ static long int timedif(struct timeval a, struct timeval b) return s + us; } -#ifdef __WIN__ +#ifdef _WIN32 static int gettimeofday(struct timeval *tp, void *tzp) { unsigned int ticks; @@ -665,7 +664,7 @@ static struct my_option my_long_options[] = {"password", 'p', "Password to use when connecting to server. If password is not given it's " "asked from the tty.", 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, -#ifdef __WIN__ +#ifdef _WIN32 {"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, #endif @@ -772,7 +771,7 @@ get_one_option(const struct my_option *opt, const char *argument, tty_password= 1; break; case 'W': -#ifdef __WIN__ +#ifdef _WIN32 opt_protocol= MYSQL_PROTOCOL_PIPE; /* Prioritize pipe if explicit via command line */ |