ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/libodb-mysql/fix-redefinttion.patch

   1 diff --git a/odb/mysql/mysql-types.hxx b/odb/mysql/mysql-types.hxx
   2 index 5396791..32a2a03 100644
   3 --- a/odb/mysql/mysql-types.hxx
   4 +++ b/odb/mysql/mysql-types.hxx
   5 @@ -7,13 +7,24 @@
   6
   7  #include <odb/mysql/details/config.hxx>
   8
   9 +#include <odb/mysql/version.hxx>
  10 +
  11  typedef bool my_bool;
  12 +
  13 +#if !defined(LIBODB_MYSQL_MARIADB) && MYSQL_VERSION_ID >= 80011
  14 +struct MYSQL_BIND;
  15 +#else
  16  typedef struct st_mysql_bind MYSQL_BIND;
  17 +#endif
  18
  19 -#ifdef LIBODB_MYSQL_INCLUDE_SHORT
  20 -#  include <mysql_time.h>
  21 +#ifdef LIBODB_MYSQL_MARIADB
  22 +#  include <mysql/mysql.h>
  23  #else
  24 -#  include <mysql/mysql_time.h>
  25 +#  ifdef LIBODB_MYSQL_INCLUDE_SHORT
  26 +#    include <mysql_time.h>
  27 +#  else
  28 +#    include <mysql/mysql_time.h>
  29 +#  endif
  30  #endif
  31
  32  #endif // ODB_MYSQL_MYSQL_TYPES_HXX