diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-06 22:42:00 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-10 18:21:28 +0100 |
| commit | 269ab56f8b4056ec63e712ba305761dd835ea10e (patch) | |
| tree | 9e2659b5b3bba59f23836d1dee8fd348bfd0f3c7 /include | |
| parent | 227f63db3b0b9a1ce29c37f1c104ba5d204d0392 (diff) | |
| download | mariadb-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')
| -rw-r--r-- | include/mysql.h | 4 | ||||
| -rw-r--r-- | include/mysql/plugin.h | 4 |
2 files changed, 6 insertions, 2 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 diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 255d009f029..a5bfa1bbc9e 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -14,8 +14,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _my_plugin_h -#define _my_plugin_h +#ifndef MYSQL_PLUGIN_INCLUDED +#define MYSQL_PLUGIN_INCLUDED /* On Windows, exports from DLL need to be declared |