[gnunet] branch master updated (2652a92f5 -> 0effaa71d)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from 2652a92f5 Merge branch 'master' of ssh://git.gnunet.org/gnunet
     new 2161f34f8 Fix git commit message preparation to properly include hints.
     new ac40efdae MYSQL: Use autoconf-based my_bool detection
     new 0effaa71d Merge remote-tracking branch 'origin/master'

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac                      | 13 +++++++++++++
 contrib/conf/prepare-commit-msg   |  2 +-
 src/include/gnunet_mysql_compat.h | 10 ----------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7ba1d27a7..ec89fd4c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -935,6 +935,19 @@ AC_ARG_WITH([mysql],
 AC_SUBST(MYSQL_LDFLAGS)
 AC_SUBST(MYSQL_CPPFLAGS)
 
+# check for my_bool
+AS_IF([test "x$mysql" = "xtrue"],
+  [AC_MSG_CHECKING([for my_bool])
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+     [[#include <mysql/mysql.h>]],
+     [[#ifndef my_bool
+#no my_bool found
+#endif]])],
+      [AC_MSG_RESULT([yes])
+       AC_DEFINE_UNQUOTED([MYSQL_BOOL], [my_bool], [Bool variable for some 
mysql versions])],
+      [AC_MSG_RESULT([no])
+       AC_DEFINE_UNQUOTED([MYSQL_BOOL], [bool], [Normal boolean value])])])
+
 # additional version checks for mysql
 AS_IF([test "x$mysql" = "xtrue"],
   [AC_MSG_CHECKING([for mysql version])
diff --git a/contrib/conf/prepare-commit-msg b/contrib/conf/prepare-commit-msg
index 8acca9e38..a95f29430 100755
--- a/contrib/conf/prepare-commit-msg
+++ b/contrib/conf/prepare-commit-msg
@@ -27,7 +27,7 @@ done
 if [ -z "$COMMIT_SOURCE" ];
 then
   hint=$(cat "$COMMIT_MSG_FILE")
-  echo -e "# Our commit subject format policy is:\n# <subsystem>: 
<description>\n# Adding 'Issue #1234'/'Fixes #1234' into the description will 
automatically update/resolve issue #1234 in mantis." >> "$COMMIT_MSG_FILE"
+  echo -e "# Our commit subject format policy is:\n# <subsystem>: 
<description>\n# Adding 'Issue #1234'/'Fixes #1234' into the description will 
automatically update/resolve issue #1234 in mantis." > "$COMMIT_MSG_FILE"
   if [ $RET = 1 ];
   then
     echo -e "# Your commit includes staged changes that indicate an API change 
which requires a NEWS line." >> "$COMMIT_MSG_FILE"
diff --git a/src/include/gnunet_mysql_compat.h 
b/src/include/gnunet_mysql_compat.h
index 9fb9db30f..38c7ecc63 100644
--- a/src/include/gnunet_mysql_compat.h
+++ b/src/include/gnunet_mysql_compat.h
@@ -41,16 +41,6 @@ extern "C"
 #endif
 #endif
 
-#ifndef LIBMARIADB
-#if MYSQL_VERSION_ID >= 80000
-#define MYSQL_BOOL bool
-#else
-#define MYSQL_BOOL my_bool /* MySQL < 8 wants this */
-#endif
-#else
-#define MYSQL_BOOL my_bool /* MariaDB still uses my_bool */
-#endif
-
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.