Changeset 1418:a51f71694121 in freeDiameter for extensions

Timestamp:

Feb 18, 2020, 6:58:20 PM (4 years ago)

Author:

Luke Mewburn <luke@mewburn.net>

Branch:

default

Phase:

public

committer:

Luke Mewburn <luke@mewburn.net> 1582020006 -39600

Message:

fix build with MySQL >= 8.0

MySQL 8.0 deprecated my_bool in favour of C99's bool.
Detect if my_bool is available, and if not, provide
a replacement.

Location:

extensions/app_diameap

Files:

• CMakeLists.txt (modified) (2 diffs)
• diameap_init.c (modified) (1 diff)

extensions/app_diameap/CMakeLists.txt

@@ -1 +1 @@
 # The Diameter EAP Application extension
 PROJECT("Diameter EAP Application extension" C)
+
+INCLUDE (CheckCSourceCompiles)
 
 # Find MySQL 
@@ -6 +8 @@
 FIND_PACKAGE(Gcrypt REQUIRED)
 INCLUDE_DIRECTORIES(${MySQL_INCLUDE_DIR})
+
+# Check for my_bool, deprecated in MySQL 8.0
+SET(CHECK_MYSQL_MY_BOOL "
+#include <mysql.h>
+int main() {
+my_bool f;
+}")
+SET(CMAKE_REQUIRED_INCLUDES ${MySQL_INCLUDE_DIR})
+SET(CMAKE_REQUIRED_LIBRARIES ${MySQL_LIBRARY})
+CHECK_C_SOURCE_COMPILES("${CHECK_MYSQL_MY_BOOL}" HAVE_MYSQL_MY_BOOL)
+IF (HAVE_MYSQL_MY_BOOL)
+  ADD_DEFINITIONS(-DHAVE_MYSQL_MY_BOOL)
+ENDIF()
 
 # Parse plugins

extensions/app_diameap/diameap_init.c

@@ -38 +38 @@
 
 #include "diameap_common.h"
+
+#ifndef HAVE_MYSQL_MY_BOOL
+#include <stdbool.h>
+typedef bool my_bool;
+#endif /* HAVE_MYSQL_MY_BOOL */
 
 /* Dictionary Object templates */