diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2002-09-30 09:14:37 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2002-09-30 09:14:37 +0000 |
| commit | d8763154548eafb39d38826ff57e8a35458a2655 (patch) | |
| tree | ebf4c48c5d14bf2e537ac501aa09316796887d59 /ace/config-win32-common.h | |
| parent | 4973b758bebdcf2e09e0feb1615692c679dea84e (diff) | |
| download | ATCD-d8763154548eafb39d38826ff57e8a35458a2655.tar.gz | |
ChangeLogTag: Mon Sep 30 09:13:45 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ace/config-win32-common.h')
| -rw-r--r-- | ace/config-win32-common.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h index ded7a356cae..6cdf5476988 100644 --- a/ace/config-win32-common.h +++ b/ace/config-win32-common.h @@ -85,19 +85,14 @@ // #endif // Define the special export macros needed to export symbols outside a dll -#if !defined (__MINGW32__) +#if !defined (__MINGW32__) && !defined(__BORLANDC__) #define ACE_HAS_CUSTOM_EXPORT_MACROS #define ACE_Proper_Export_Flag __declspec (dllexport) #define ACE_Proper_Import_Flag __declspec (dllimport) #define ACE_EXPORT_SINGLETON_DECLARATION(T) template class __declspec (dllexport) T #define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE<CLASS, LOCK>; -#if defined (__BORLANDC__) -#define ACE_IMPORT_SINGLETON_DECLARATION(T) template class __declspec (dllimport) T -#define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllimport) SINGLETON_TYPE <CLASS, LOCK>; -#else /* __BORLANDC__ */ #define ACE_IMPORT_SINGLETON_DECLARATION(T) extern template class T #define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE <CLASS, LOCK>; -#endif /* __BORLANDC__ */ #endif /* !__MINGW32__ */ // Define ACE_HAS_WINSOCK2 to 0 in your config.h file if you do *not* |