aboutsummaryrefslogtreecommitdiff
path: root/odb/mysql/details/config.hxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2010-09-06 14:23:23 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2010-09-06 14:23:23 +0200
commit5737a46a761a6af5d47b2ae68e264d30836adb9a (patch)
treecd767594f100f7af7e94a1cafe6abc46a50bd889 /odb/mysql/details/config.hxx
parent404ef5ab95820f49df26b5b41ecec0db83105e17 (diff)
Generate config.h
Diffstat (limited to 'odb/mysql/details/config.hxx')
-rw-r--r--odb/mysql/details/config.hxx16
1 files changed, 7 insertions, 9 deletions
diff --git a/odb/mysql/details/config.hxx b/odb/mysql/details/config.hxx
index 957f623..30ac531 100644
--- a/odb/mysql/details/config.hxx
+++ b/odb/mysql/details/config.hxx
@@ -8,18 +8,16 @@
// no pre
-#ifdef HAVE_CONFIG_H
+#ifdef _MSC_VER
+# if !defined(LIBODB_MYSQL_INCLUDE_SHORT) && !defined (LIBODB_MYSQL_INCLUDE_LONG)
+# define LIBODB_MYSQL_INCLUDE_SHORT 1
+# endif
+#elif defined(ODB_COMPILER)
+# error libodb-mysql header included in odb-compiled header
+#else
# include <odb/mysql/details/config.h>
#endif
-#if !defined(LIBODB_MYSQL_INCLUDE_SHORT) && !defined (LIBODB_MYSQL_INCLUDE_LONG)
- #ifdef _WIN32
- #define LIBODB_MYSQL_INCLUDE_SHORT 1
- #else
- #define LIBODB_MYSQL_INCLUDE_LONG 1
- #endif
-#endif
-
// no post
#endif // ODB_MYSQL_DETAILS_CONFIG_HXX