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

@@ -30,7 +30,7 @@ extern "C" {
#define EXTERNC
#endif /* __cplusplus */
#if defined(__WIN__)
#if defined(_WIN32)
typedef CRITICAL_SECTION pthread_mutex_t;
typedef DWORD pthread_t;
typedef struct thread_attr {
@@ -277,7 +277,7 @@ struct tm *gmtime_r(const time_t *clock, struct tm *res);
#define HAVE_PTHREAD_KILL 1
#endif
#endif /* defined(__WIN__) */
#endif /* defined(_WIN32) */
#if defined(HPUX10) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)
#undef pthread_cond_timedwait