summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch')
-rw-r--r--dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch8
1 files changed, 5 insertions, 3 deletions
diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch b/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch
index 48816555a21c..eda0cd041287 100644
--- a/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch
+++ b/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch
@@ -1,13 +1,15 @@
--- a/dbd/apr_dbd_mysql.c
+++ b/dbd/apr_dbd_mysql.c
-@@ -41,6 +41,10 @@
+@@ -41,6 +41,12 @@
#endif
#endif
#include <mysql.h>
-+#ifndef HAVE_TYPE_MY_BOOL
-+#include <stdbool.h>
++// MariaDB still include definition of my_bool but has a higher version ID
++#ifndef MARIADB_VERSION_ID
++#if MYSQL_VERSION_ID > 80000
+typedef bool my_bool;
+#endif
++#endif
#include <errmsg.h>
#endif