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 /unittest | |
| 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 'unittest')
| -rw-r--r-- | unittest/mytap/tap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unittest/mytap/tap.c b/unittest/mytap/tap.c index 65608e0de05..86edea11411 100644 --- a/unittest/mytap/tap.c +++ b/unittest/mytap/tap.c @@ -345,7 +345,7 @@ int exit_status() return EXIT_SUCCESS; } -#if defined(__WIN__) || defined(__NETWARE__) +#if defined(_WIN32) #include <time.h> #else #include <sys/times.h> @@ -357,7 +357,7 @@ int exit_status() static ulong start_timer(void) { -#if defined(__WIN__) || defined(__NETWARE__) +#if defined(_WIN32) return clock(); #else struct tms tms_tmp; |