summaryrefslogtreecommitdiff
path: root/include/mysql.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-03-06 22:42:00 +0100
committerSergei Golubchik <serg@mariadb.org>2017-03-10 18:21:28 +0100
commit269ab56f8b4056ec63e712ba305761dd835ea10e (patch)
tree9e2659b5b3bba59f23836d1dee8fd348bfd0f3c7 /include/mysql.h
parent227f63db3b0b9a1ce29c37f1c104ba5d204d0392 (diff)
downloadmariadb-git-269ab56f8b4056ec63e712ba305761dd835ea10e.tar.gz
small plugin API related fixes
* define MYSQL_DYNAMIC_PLUGIN only for server plugins * don't typedef my_bool in mysql.h if plugin.h has already done it * fix the include guard in plugin.h
Diffstat (limited to 'include/mysql.h')
-rw-r--r--include/mysql.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/mysql.h b/include/mysql.h
index f088ad668a1..53c86aee889 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -48,7 +48,11 @@ extern "C" {
#ifndef MYSQL_ABI_CHECK
#include <sys/types.h>
#endif
+
+#ifndef MYSQL_PLUGIN_INCLUDED
typedef char my_bool;
+#endif
+
#if (defined(_WIN32) || defined(_WIN64)) && !defined(__WIN__)
#define __WIN__
#endif