summaryrefslogtreecommitdiff
path: root/storage/connect/global.h
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2021-07-31 23:19:51 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2021-07-31 23:19:51 +0200
commitae6bdc6769646a09a8d4d08a42a69174ea677768 (patch)
treec80afdd0e3238dc5092fdcb1439f1390f9a9040b /storage/connect/global.h
parenta49f5525bbe1bb1f4320bd0db066068a81af62d9 (diff)
parent7841a7eb09208f52fcbab7e80e38c7ca29b1339e (diff)
downloadmariadb-git-ae6bdc6769646a09a8d4d08a42a69174ea677768.tar.gz
Merge branch '10.4' into 10.5
Diffstat (limited to 'storage/connect/global.h')
-rw-r--r--storage/connect/global.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/storage/connect/global.h b/storage/connect/global.h
index 8774285e54b..eb3d4106477 100644
--- a/storage/connect/global.h
+++ b/storage/connect/global.h
@@ -14,11 +14,11 @@
#include <time.h> /* time_t type declaration */
#include <setjmp.h> /* Long jump declarations */
-#if defined(__WIN__) && !defined(NOEX)
+#if defined(_WIN32) && !defined(NOEX)
#define DllExport __declspec( dllexport )
-#else // !__WIN__
+#else // !_WIN32
#define DllExport
-#endif // !__WIN__
+#endif // !_WIN32
#if defined(DOMDOC_SUPPORT) || defined(LIBXML2_SUPPORT)
#define XML_SUPPORT 1
@@ -43,11 +43,11 @@
#define STEP(I) MSG_##I
#endif // !XMSG and !NEWMSG
-#if defined(__WIN__)
+#if defined(_WIN32)
#define CRLF 2
-#else // !__WIN__
+#else // !_WIN32
#define CRLF 1
-#endif // !__WIN__
+#endif // !_WIN32
/***********************************************************************/
/* Define access to the thread based trace value. */
@@ -204,9 +204,9 @@ DllExport char *PlugReadMessage(PGLOBAL, int, char *);
#elif defined(NEWMSG)
DllExport char *PlugGetMessage(PGLOBAL, int);
#endif // XMSG || NEWMSG
-#if defined(__WIN__)
+#if defined(_WIN32)
DllExport short GetLineLength(PGLOBAL); // Console line length
-#endif // __WIN__
+#endif // _WIN32
DllExport PGLOBAL PlugInit(LPCSTR, size_t); // Plug global initialization
DllExport PGLOBAL PlugExit(PGLOBAL); // Plug global termination
DllExport LPSTR PlugRemoveType(LPSTR, LPCSTR);