MDEV-25602 Eliminate the rest of __WIN__ in Connect

include/my_global.h

@@ -22,16 +22,12 @@
 
 /*
   MDEV-25602 Deprecate __WIN__ symbol.
-  Temporarily, allow inside connect engine,
-  until fixed in upstream.
 */
-#ifndef connect_EXPORTS
 #ifdef _MSC_VER
 #pragma deprecated("__WIN__")
 #elif defined (__GNUC__)
 #pragma GCC poison __WIN__
 #endif
-#endif
 
 /*
   InnoDB depends on some MySQL internals which other plugins should not

storage/connect/CMakeLists.txt

@@ -72,7 +72,7 @@ IF(UNIX)
   get_property(inc_dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
   SET(CONNECT_SOURCES ${CONNECT_SOURCES} inihandl.cpp)
   SET(IPHLPAPI_LIBRARY "")
-ELSE(NOT UNIX)
+ELSE()
   SET(CONNECT_SOURCES ${CONNECT_SOURCES}
   tabwmi.cpp tabwmi.h tabmac.cpp tabmac.h macutil.cpp macutil.h)
   # Add exception handling to the CONNECT project)
@@ -82,8 +82,7 @@ ELSE(NOT UNIX)
     # Connect does not work with clang-cl
     RETURN()
   ENDIF()
-  add_definitions(-D__WIN__)
-ENDIF(UNIX)
+ENDIF()
 
 
 #

storage/connect/noconst.c

@@ -5,11 +5,11 @@
 #include <mysqld.h>
 #include <string.h>
 
-#if defined(__WIN__)
+#if defined(_WIN32)
 #define DllExport  __declspec( dllexport )
-#else   // !__WIN__
+#else   // !_WIN32
 #define DllExport
-#endif  // !__WIN__
+#endif  // !_WIN32
 
 extern "C" {
 	DllExport my_bool noconst_init(UDF_INIT*, UDF_ARGS*, char*);