diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/Makefile.am | 1 | ||||
-rw-r--r-- | src/include/gnunet_mhd_compat.h | 2 | ||||
-rw-r--r-- | src/include/gnunet_my_lib.h | 7 | ||||
-rw-r--r-- | src/include/gnunet_mysql_lib.h | 11 |
4 files changed, 8 insertions, 13 deletions
diff --git a/src/include/Makefile.am b/src/include/Makefile.am index ca1aff6e1..86bcb0ec1 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am | |||
@@ -77,6 +77,7 @@ gnunetinclude_HEADERS = \ | |||
77 | gnunet_mst_lib.h \ | 77 | gnunet_mst_lib.h \ |
78 | gnunet_mq_lib.h \ | 78 | gnunet_mq_lib.h \ |
79 | gnunet_my_lib.h \ | 79 | gnunet_my_lib.h \ |
80 | gnunet_mysql_compat.h \ | ||
80 | gnunet_mysql_lib.h \ | 81 | gnunet_mysql_lib.h \ |
81 | gnunet_namecache_plugin.h \ | 82 | gnunet_namecache_plugin.h \ |
82 | gnunet_namecache_service.h \ | 83 | gnunet_namecache_service.h \ |
diff --git a/src/include/gnunet_mhd_compat.h b/src/include/gnunet_mhd_compat.h index ca41fb95a..7ef297c2f 100644 --- a/src/include/gnunet_mhd_compat.h +++ b/src/include/gnunet_mhd_compat.h | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | #else | 37 | #else |
38 | 38 | ||
39 | /** | 39 | ** |
40 | * Data type to use for functions return an "MHD result". | 40 | * Data type to use for functions return an "MHD result". |
41 | */ | 41 | */ |
42 | #define MHD_RESULT int | 42 | #define MHD_RESULT int |
diff --git a/src/include/gnunet_my_lib.h b/src/include/gnunet_my_lib.h index 68ce16286..283b2f7e6 100644 --- a/src/include/gnunet_my_lib.h +++ b/src/include/gnunet_my_lib.h | |||
@@ -18,11 +18,12 @@ | |||
18 | SPDX-License-Identifier: AGPL3.0-or-later | 18 | SPDX-License-Identifier: AGPL3.0-or-later |
19 | */ | 19 | */ |
20 | /** | 20 | /** |
21 | * @addtogroup lib_extra | 21 | * @addtogroup lib_extra |
22 | * @{ | 22 | * @{ |
23 | * | 23 | * |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | * @author Christophe Genevey | 25 | * @author Christophe Genevey |
26 | * @author Martin Schanzenbach | ||
26 | * | 27 | * |
27 | * @file | 28 | * @file |
28 | * Helper library to access a MySQL database | 29 | * Helper library to access a MySQL database |
@@ -39,6 +40,10 @@ | |||
39 | #include "gnunet_mysql_lib.h" | 40 | #include "gnunet_mysql_lib.h" |
40 | #include <mysql/mysql.h> | 41 | #include <mysql/mysql.h> |
41 | 42 | ||
43 | #ifndef MYSQL_BOOL | ||
44 | #error "You need to define MYSQL_BOOL. See (or include) gnunet_mysql_compat.h" | ||
45 | #endif | ||
46 | |||
42 | #ifdef __cplusplus | 47 | #ifdef __cplusplus |
43 | extern "C" | 48 | extern "C" |
44 | { | 49 | { |
diff --git a/src/include/gnunet_mysql_lib.h b/src/include/gnunet_mysql_lib.h index 88408890b..52be3ff11 100644 --- a/src/include/gnunet_mysql_lib.h +++ b/src/include/gnunet_mysql_lib.h | |||
@@ -42,17 +42,6 @@ extern "C" | |||
42 | #endif | 42 | #endif |
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | #ifndef LIBMARIADB | ||
46 | #ifdef HAVE_MYSQL8 && !LIBMARIADB | ||
47 | typedef bool MYSQL_BOOL; | ||
48 | #else | ||
49 | typedef my_bool MYSQL_BOOL; //MySQL < 8 wants this | ||
50 | #endif | ||
51 | #else | ||
52 | typedef my_bool MYSQL_BOOL; //MariaDB still uses my_bool | ||
53 | #endif | ||
54 | |||
55 | |||
56 | /** | 45 | /** |
57 | * Mysql context. | 46 | * Mysql context. |
58 | */ | 47 | */ |