diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-30 12:48:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-30 12:48:42 +0200 |
| commit | da4d71d10d23c1ac2d10b72baee14991ccb7a146 (patch) | |
| tree | 7cdf3a8c8e72ca7c1c8105427c04123f025bd870 /include/mysql.h | |
| parent | 9ec85009985d644ce7ae797bc3572d0ad0f69bb0 (diff) | |
| parent | a00517ac9707ffd51c092f5af5d198c5ee789bb4 (diff) | |
| download | mariadb-git-da4d71d10d23c1ac2d10b72baee14991ccb7a146.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/mysql.h b/include/mysql.h index 80e75c264e8..8d8e0589282 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 |