7 files changed, 12 insertions, 108 deletions
diff --git a/libodb-mysql/odb/mysql/buildfile b/libodb-mysql/odb/mysql/buildfile
index 708d093..42e5e88 100644
--- a/libodb-mysql/odb/mysql/buildfile
+++ b/libodb-mysql/odb/mysql/buildfile
@@ -12,7 +12,6 @@ import int_libs += ($client_lib == 'mysql'            \
 
 lib{odb-mysql}: {hxx ixx txx cxx}{* -version} {hxx}{version} \
         details/{hxx ixx txx cxx}{* -options}                \
- details/build2/{h}{*}                                       \
                 $int_libs
 
 # Include the generated version header into the distribution (so that we don't
@@ -28,7 +27,7 @@ hxx{version}:
 
 # Build options.
 #
-cxx.poptions =+ "-I$out_root" "-I$src_root" -DLIBODB_MYSQL_BUILD2
+cxx.poptions =+ "-I$out_root" "-I$src_root"
 
 if ($client_lib == 'mariadb')
   cxx.poptions += -DLIBODB_MYSQL_MARIADB
@@ -40,7 +39,7 @@ objs{*}: cxx.poptions += -DLIBODB_MYSQL_SHARED_BUILD
 #
 lib{odb-mysql}:
 {
-  cxx.export.poptions = "-I$out_root" "-I$src_root" -DLIBODB_MYSQL_BUILD2
+  cxx.export.poptions = "-I$out_root" "-I$src_root"
   cxx.export.libs = $int_libs
 }
 
@@ -141,19 +140,3 @@ install_include = [dir_path] include/odb/mysql/
   install         = $install_include
   install.subdirs = true
 }
-
-details/build2/
-{
-  h{*}: install = false
-
-  if ($cxx.target.system == 'win32-msvc')
-  {
-    h{config-vc}@./:      install = $install_include/details/
-    h{config-vc-stub}@./: install = $install_include/details/build2/config-vc.h
-  }
-  else
-  {
-    h{config}@./:      install = $install_include/details/
-    h{config-stub}@./: install = $install_include/details/build2/config.h
-  }
-}
diff --git a/libodb-mysql/odb/mysql/details/build2/config-stub.h b/libodb-mysql/odb/mysql/details/build2/config-stub.h
deleted file mode 100644
index d9d08eb..0000000
--- a/libodb-mysql/odb/mysql/details/build2/config-stub.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* file      : odb/mysql/details/build2/config-stub.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-#include <odb/mysql/details/config.h>
diff --git a/libodb-mysql/odb/mysql/details/build2/config-vc-stub.h b/libodb-mysql/odb/mysql/details/build2/config-vc-stub.h
deleted file mode 100644
index e22c7c2..0000000
--- a/libodb-mysql/odb/mysql/details/build2/config-vc-stub.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* file      : odb/mysql/details/build2/config-vc-stub.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-#include <odb/mysql/details/config-vc.h>
diff --git a/libodb-mysql/odb/mysql/details/build2/config-vc.h b/libodb-mysql/odb/mysql/details/build2/config-vc.h
deleted file mode 100644
index 3adb630..0000000
--- a/libodb-mysql/odb/mysql/details/build2/config-vc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* file      : odb/mysql/details/build2/config-vc.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* Configuration file for Windows/VC++ for the build2 build. */
-
-#ifndef ODB_MYSQL_DETAILS_CONFIG_VC_H
-#define ODB_MYSQL_DETAILS_CONFIG_VC_H
-
-/* Define LIBODB_MYSQL_BUILD2 for the installed case. */
-#ifndef LIBODB_MYSQL_BUILD2
-#  define LIBODB_MYSQL_BUILD2
-#endif
-
-#endif /* ODB_MYSQL_DETAILS_CONFIG_VC_H */
diff --git a/libodb-mysql/odb/mysql/details/build2/config.h b/libodb-mysql/odb/mysql/details/build2/config.h
deleted file mode 100644
index ef6a60f..0000000
--- a/libodb-mysql/odb/mysql/details/build2/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* file      : odb/mysql/details/build2/config.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* Static configuration file for the build2 build. The installed case
-   (when LIBODB_MYSQL_BUILD2 is not necessarily defined) is the only
-   reason we have it. */
-
-#ifndef ODB_MYSQL_DETAILS_CONFIG_H
-#define ODB_MYSQL_DETAILS_CONFIG_H
-
-/* Define LIBODB_MYSQL_BUILD2 for the installed case. */
-#ifndef LIBODB_MYSQL_BUILD2
-#  define LIBODB_MYSQL_BUILD2
-#endif
-
-#endif /* ODB_MYSQL_DETAILS_CONFIG_H */
diff --git a/libodb-mysql/odb/mysql/details/config.hxx b/libodb-mysql/odb/mysql/details/config.hxx
index eeeee5c..f093e9d 100644
--- a/libodb-mysql/odb/mysql/details/config.hxx
+++ b/libodb-mysql/odb/mysql/details/config.hxx
@@ -8,23 +8,14 @@
 
 #ifdef ODB_COMPILER
 #  error libodb-mysql header included in odb-compiled header
-#elif !defined(LIBODB_MYSQL_BUILD2)
-#  ifdef _MSC_VER
-#    include <odb/mysql/details/config-vc.h>
-#  else
-#    include <odb/mysql/details/config.h>
-#  endif
 #endif
 
-// LIBODB_MYSQL_BUILD2 macro can be defined either by the buildfile or by the
-// included odb/mysql/details/config*.h (see above).
+// @@ TMP: drop (along with LIBODB_MYSQL_THR_KEY_VISIBLE) after 2.5.0.
 //
-#ifdef LIBODB_MYSQL_BUILD2
-#  ifdef LIBODB_MYSQL_INCLUDE_SHORT
-#    error mysql headers must be included with mysql/ prefix
-#  elif !defined(LIBODB_MYSQL_INCLUDE_LONG)
-#    define LIBODB_MYSQL_INCLUDE_LONG 1
-#  endif
+#ifdef LIBODB_MYSQL_INCLUDE_SHORT
+#  error mysql headers must be included with mysql/ prefix
+#elif !defined(LIBODB_MYSQL_INCLUDE_LONG)
+#  define LIBODB_MYSQL_INCLUDE_LONG 1
 #endif
 
 // no post
diff --git a/libodb-mysql/odb/mysql/details/export.hxx b/libodb-mysql/odb/mysql/details/export.hxx
index e7c3871..817c7a4 100644
--- a/libodb-mysql/odb/mysql/details/export.hxx
+++ b/libodb-mysql/odb/mysql/details/export.hxx
@@ -6,7 +6,11 @@
 
 #include <odb/pre.hxx>
 
-#include <odb/mysql/details/config.hxx>
+// Note: do this check directly instead of including config.hxx.
+//
+#ifdef ODB_COMPILER
+#  error libodb-mysql header included in odb-compiled header
+#endif
 
 // Normally we don't export class templates (but do complete specializations),
 // inline functions, and classes with only inline member functions. Exporting
@@ -16,8 +20,6 @@
 // used before their inline definition. The workaround is to reorder code. In
 // the end it's all trial and error.
 
-#ifdef LIBODB_MYSQL_BUILD2
-
 #if defined(LIBODB_MYSQL_STATIC)         // Using static.
 #  define LIBODB_MYSQL_EXPORT
 #elif defined(LIBODB_MYSQL_STATIC_BUILD) // Building static.
@@ -43,36 +45,6 @@
 #  define LIBODB_MYSQL_EXPORT            // Using static or shared.
 #endif
 
-#else // LIBODB_MYSQL_BUILD2
-
-#ifdef LIBODB_MYSQL_STATIC_LIB
-#  define LIBODB_MYSQL_EXPORT
-#else
-#  ifdef _WIN32
-#    ifdef _MSC_VER
-#      ifdef LIBODB_MYSQL_DYNAMIC_LIB
-#        define LIBODB_MYSQL_EXPORT __declspec(dllexport)
-#      else
-#        define LIBODB_MYSQL_EXPORT __declspec(dllimport)
-#      endif
-#    else
-#      ifdef LIBODB_MYSQL_DYNAMIC_LIB
-#        ifdef DLL_EXPORT
-#          define LIBODB_MYSQL_EXPORT __declspec(dllexport)
-#        else
-#          define LIBODB_MYSQL_EXPORT
-#        endif
-#      else
-#        define LIBODB_MYSQL_EXPORT __declspec(dllimport)
-#      endif
-#    endif
-#  else
-#    define LIBODB_MYSQL_EXPORT
-#  endif
-#endif
-
-#endif // LIBODB_MYSQL_BUILD2
-
 #include <odb/post.hxx>
 
 #endif // ODB_MYSQL_DETAILS_EXPORT_HXX