From 6586a59e63d089f38503656949d7aa8734ca8924 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 27 Nov 2017 23:59:42 +0300
Subject: Add support for build2 build

---
 odb/mysql/mysql-types.hxx | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'odb/mysql/mysql-types.hxx')

diff --git a/odb/mysql/mysql-types.hxx b/odb/mysql/mysql-types.hxx
index cd92d41..362d618 100644
--- a/odb/mysql/mysql-types.hxx
+++ b/odb/mysql/mysql-types.hxx
@@ -10,10 +10,18 @@
 typedef char my_bool;
 typedef struct st_mysql_bind MYSQL_BIND;
 
-#ifdef LIBODB_MYSQL_INCLUDE_SHORT
-#  include <mysql_time.h>
+// MariaDB defines time types directly in mysql.h. Note that MariaDB is only
+// supported by the build2 build so we include the header as <mysql/mysql.h>
+// unconditionally.
+//
+#ifdef LIBODB_MYSQL_MARIADB
+#  include <mysql/mysql.h>
 #else
-#  include <mysql/mysql_time.h>
+#  ifdef LIBODB_MYSQL_INCLUDE_SHORT
+#    include <mysql_time.h>
+#  else
+#    include <mysql/mysql_time.h>
+#  endif
 #endif
 
 #endif // ODB_MYSQL_MYSQL_TYPES_HXX
-- 
cgit v1.1