diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-08-04 12:44:46 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-08-05 11:32:41 +0200 |
| commit | 3cc23c9973394b6626745bd8966c9a8c660468be (patch) | |
| tree | a136260b210ade6c59a60f8a154e31f9093c6e03 /storage/connect | |
| parent | 7308e009c9c2161fa4d3f5532104c7da53e5ac27 (diff) | |
| download | mariadb-git-3cc23c9973394b6626745bd8966c9a8c660468be.tar.gz | |
MDEV-25602 Eliminate the rest of __WIN__ in Connect
Diffstat (limited to 'storage/connect')
| -rw-r--r-- | storage/connect/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | storage/connect/noconst.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt index c3418cca351..a6b30e1bbcd 100644 --- a/storage/connect/CMakeLists.txt +++ b/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() # diff --git a/storage/connect/noconst.c b/storage/connect/noconst.c index 043eae7c54e..830a849491f 100644 --- a/storage/connect/noconst.c +++ b/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*); |