diff options
| author | Peter Levine <plevine457@gmail.com> | 2019-10-17 23:08:57 -0400 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-10-18 07:39:40 +0200 |
| commit | 5917ba8bc645a2b105ec089101b8a664481b5b61 (patch) | |
| tree | 853b9d5acb313790d26e6e472f44af8aecd89ef3 /connectivity/source | |
| parent | 6fe42f2050948f1d12bfb804e4c8fe1b82a6aa1d (diff) | |
Fix building against MySQL Connector/C 8
In MySQL Connector/C 8, my_bool is replaced by bool. It was
previously defined as char. When building against
MySQL Connector/C 8, this leads to type punning build errors.
Redefine affected members of struct BindMetaData as bool if using
version 8 of greater. Otherwise, default to char.
Change-Id: If12b975d95afae86502867cb334cb4195802f91d
Reviewed-on: https://gerrit.libreoffice.org/81002
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'connectivity/source')
| -rw-r--r-- | connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx index 1df2c704a38d..3450473ee895 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx @@ -39,11 +39,17 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Type; +#if defined MYSQL_VERSION_ID && (MYSQL_VERSION_ID >= 80000) +using my_bool = bool; +#else +using my_bool = char; +#endif + struct BindMetaData { - char is_null = 0; + my_bool is_null = 0; unsigned long length = 0; - char error = 0; + my_bool error = 0; }; typedef ::cppu::ImplHelper5<css::sdbc::XPreparedStatement, css::sdbc::XParameters, |