diff options
Diffstat (limited to 'include/defs.h')
| -rw-r--r-- | include/defs.h | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/include/defs.h b/include/defs.h index 2ceb73f..66fedc5 100644 --- a/include/defs.h +++ b/include/defs.h @@ -5,11 +5,11 @@ #define SWORDDEFS_H #ifdef NO_SWORD_NAMESPACE -#define SWORD_NAMESPACE_START -#define SWORD_NAMESPACE_END + #define SWORD_NAMESPACE_START + #define SWORD_NAMESPACE_END #else -#define SWORD_NAMESPACE_START namespace sword { -#define SWORD_NAMESPACE_END } + #define SWORD_NAMESPACE_START namespace sword { + #define SWORD_NAMESPACE_END } #endif @@ -17,8 +17,6 @@ SWORD_NAMESPACE_START #define FILTERPAD 16 -#if defined(__SWMSW__) - // _declspec works in BC++ 5 and later, as well as VC++ #if defined(_MSC_VER) @@ -52,7 +50,7 @@ SWORD_NAMESPACE_START # define SWDLLEXPORT_CTORFN # endif -#elif defined(__GNUWIN32__) || defined(__BORLANDC__) +#elif defined(__GNUWIN32__) # ifdef SWMAKINGDLL # define SWDLLEXPORT __declspec( dllexport ) @@ -68,6 +66,20 @@ SWORD_NAMESPACE_START # define SWDLLEXPORT_CTORFN # endif +#elif defined(__BORLANDC__) +# ifdef SWMAKINGDLL +# define SWDLLEXPORT _export +# define SWDLLEXPORT_DATA(type) __declspec( dllexport ) type +# define SWDLLEXPORT_CTORFN +# elif defined(SWUSINGDLL) +# define SWDLLEXPORT __declspec( dllimport ) +# define SWDLLEXPORT_DATA(type) __declspec( dllimport ) type +# define SWDLLEXPORT_CTORFN +# else +# define SWDLLEXPORT +# define SWDLLEXPORT_DATA(type) type +# define SWDLLEXPORT_CTORFN +# endif #else # define SWDLLEXPORT @@ -75,12 +87,6 @@ SWORD_NAMESPACE_START # define SWDLLEXPORT_CTORFN #endif -#else // !Windows -# define SWDLLEXPORT -# define SWDLLEXPORT_DATA(type) type -# define SWDLLEXPORT_CTORFN -#endif // Win/!Win - // For ostream, istream ofstream #if defined(__BORLANDC__) && defined( _RTLDLL ) # define SWDLLIMPORT __import |