diff options
Diffstat (limited to 'libodb-sqlite/odb/sqlite/details/export.hxx')
-rw-r--r-- | libodb-sqlite/odb/sqlite/details/export.hxx | 40 |
1 files changed, 2 insertions, 38 deletions
diff --git a/libodb-sqlite/odb/sqlite/details/export.hxx b/libodb-sqlite/odb/sqlite/details/export.hxx index c0903ae..639db2a 100644 --- a/libodb-sqlite/odb/sqlite/details/export.hxx +++ b/libodb-sqlite/odb/sqlite/details/export.hxx @@ -6,14 +6,10 @@ #include <odb/pre.hxx> +// Note: do this check directly instead of including config.hxx. +// #ifdef ODB_COMPILER # error libodb-sqlite header included in odb-compiled header -#elif !defined(LIBODB_SQLITE_BUILD2) -# ifdef _MSC_VER -# include <odb/sqlite/details/config-vc.h> -# else -# include <odb/sqlite/details/config.h> -# endif #endif // Normally we don't export class templates (but do complete specializations), @@ -24,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_SQLITE_BUILD2 - #if defined(LIBODB_SQLITE_STATIC) // Using static. # define LIBODB_SQLITE_EXPORT #elif defined(LIBODB_SQLITE_STATIC_BUILD) // Building static. @@ -51,36 +45,6 @@ # define LIBODB_SQLITE_EXPORT // Using static or shared. #endif -#else // LIBODB_SQLITE_BUILD2 - -#ifdef LIBODB_SQLITE_STATIC_LIB -# define LIBODB_SQLITE_EXPORT -#else -# ifdef _WIN32 -# ifdef _MSC_VER -# ifdef LIBODB_SQLITE_DYNAMIC_LIB -# define LIBODB_SQLITE_EXPORT __declspec(dllexport) -# else -# define LIBODB_SQLITE_EXPORT __declspec(dllimport) -# endif -# else -# ifdef LIBODB_SQLITE_DYNAMIC_LIB -# ifdef DLL_EXPORT -# define LIBODB_SQLITE_EXPORT __declspec(dllexport) -# else -# define LIBODB_SQLITE_EXPORT -# endif -# else -# define LIBODB_SQLITE_EXPORT __declspec(dllimport) -# endif -# endif -# else -# define LIBODB_SQLITE_EXPORT -# endif -#endif - -#endif // LIBODB_SQLITE_BUILD2 - #include <odb/post.hxx> #endif // ODB_SQLITE_DETAILS_EXPORT_HXX |