diff options
Diffstat (limited to 'libodb/odb/details/export.hxx')
-rw-r--r-- | libodb/odb/details/export.hxx | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/libodb/odb/details/export.hxx b/libodb/odb/details/export.hxx index 80fe342..2ddc104 100644 --- a/libodb/odb/details/export.hxx +++ b/libodb/odb/details/export.hxx @@ -6,7 +6,7 @@ #include <odb/pre.hxx> -#include <odb/details/config.hxx> +#include <odb/details/config.hxx> // LIBODB_STATIC if ODB_COMPILER // Normally we don't export class templates (but do complete specializations), // inline functions, and classes with only inline member functions. Exporting @@ -16,8 +16,6 @@ // used before their inline definition. The workaround is to reorder code. In // the end it's all trial and error. -#ifdef LIBODB_BUILD2 - #if defined(LIBODB_STATIC) // Using static. # define LIBODB_EXPORT #elif defined(LIBODB_STATIC_BUILD) // Building static. @@ -43,36 +41,6 @@ # define LIBODB_EXPORT // Using static or shared. #endif -#else // LIBODB_BUILD2 - -#ifdef LIBODB_STATIC_LIB -# define LIBODB_EXPORT -#else -# ifdef _WIN32 -# ifdef _MSC_VER -# ifdef LIBODB_DYNAMIC_LIB -# define LIBODB_EXPORT __declspec(dllexport) -# else -# define LIBODB_EXPORT __declspec(dllimport) -# endif -# else -# ifdef LIBODB_DYNAMIC_LIB -# ifdef DLL_EXPORT -# define LIBODB_EXPORT __declspec(dllexport) -# else -# define LIBODB_EXPORT -# endif -# else -# define LIBODB_EXPORT __declspec(dllimport) -# endif -# endif -# else -# define LIBODB_EXPORT -# endif -#endif - -#endif // LIBODB_BUILD2 - #include <odb/post.hxx> #endif // ODB_DETAILS_EXPORT_HXX |