diff options
Diffstat (limited to 'libodb-mssql/odb/mssql/details/export.hxx')
-rw-r--r-- | libodb-mssql/odb/mssql/details/export.hxx | 38 |
1 files changed, 5 insertions, 33 deletions
diff --git a/libodb-mssql/odb/mssql/details/export.hxx b/libodb-mssql/odb/mssql/details/export.hxx index 94e762b..cd74078 100644 --- a/libodb-mssql/odb/mssql/details/export.hxx +++ b/libodb-mssql/odb/mssql/details/export.hxx @@ -6,7 +6,11 @@ #include <odb/pre.hxx> -#include <odb/mssql/details/config.hxx> +// Note: do this check directly instead of including config.hxx. +// +#ifdef ODB_COMPILER +# error libodb-mssql 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_MSSQL_BUILD2 - #if defined(LIBODB_MSSQL_STATIC) // Using static. # define LIBODB_MSSQL_EXPORT #elif defined(LIBODB_MSSQL_STATIC_BUILD) // Building static. @@ -43,36 +45,6 @@ # define LIBODB_MSSQL_EXPORT // Using static or shared. #endif -#else // LIBODB_MSSQL_BUILD2 - -#ifdef LIBODB_MSSQL_STATIC_LIB -# define LIBODB_MSSQL_EXPORT -#else -# ifdef _WIN32 -# ifdef _MSC_VER -# ifdef LIBODB_MSSQL_DYNAMIC_LIB -# define LIBODB_MSSQL_EXPORT __declspec(dllexport) -# else -# define LIBODB_MSSQL_EXPORT __declspec(dllimport) -# endif -# else -# ifdef LIBODB_MSSQL_DYNAMIC_LIB -# ifdef DLL_EXPORT -# define LIBODB_MSSQL_EXPORT __declspec(dllexport) -# else -# define LIBODB_MSSQL_EXPORT -# endif -# else -# define LIBODB_MSSQL_EXPORT __declspec(dllimport) -# endif -# endif -# else -# define LIBODB_MSSQL_EXPORT -# endif -#endif - -#endif // LIBODB_MSSQL_BUILD2 - #include <odb/post.hxx> #endif // ODB_MSSQL_DETAILS_EXPORT_HXX |