PR 172

Fix Sigbus when calling mysql_real_connect_start on ARM/MacOS
mariadb-corporation · Mar 3, 2022 · d706eaf · d706eaf
1 parent abbd2fa
commit d706eaf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/include/ma_context.h b/include/ma_context.h
@@ -52,9 +52,6 @@ struct my_context {
 
 
 #ifdef MY_CONTEXT_USE_UCONTEXT
-#if defined(__APPLE__) && !defined(_XOPEN_SOURCE)
-#define _XOPEN_SOURCE 600
-#endif
 #include <ucontext.h>
 
 struct my_context {

diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
@@ -5,6 +5,10 @@ ADD_DEFINITIONS(-D HAVE_COMPRESS)
 ADD_DEFINITIONS(-D LIBMARIADB)
 ADD_DEFINITIONS(-D THREAD)
 
+IF(APPLE)
+  ADD_DEFINITIONS(-D _XOPEN_SOURCE)
+ENDIF()
+
 INCLUDE(${CC_SOURCE_DIR}/cmake/sign.cmake)
 
 SET(MARIADB_LIB_SYMBOLS