diff options
Diffstat (limited to 'ACE/ace/config-cygwin32.h')
| -rw-r--r-- | ACE/ace/config-cygwin32.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/ACE/ace/config-cygwin32.h b/ACE/ace/config-cygwin32.h index c8f04092a2b..460a90c57bb 100644 --- a/ACE/ace/config-cygwin32.h +++ b/ACE/ace/config-cygwin32.h @@ -25,13 +25,15 @@ #endif /* ACE_IOV_MAX */ // Define custom export macros for export/import of symbols from/of dll's -#define ACE_HAS_CUSTOM_EXPORT_MACROS 1 -#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>; -#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>; +#if !defined (ACE_HAS_CUSTOM_EXPORT_MACROS) +# define ACE_HAS_CUSTOM_EXPORT_MACROS 1 +# 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>; +# 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 #define ACE_HAS_SELECT_H @@ -196,9 +198,11 @@ # define ACE_LACKS_PTHREAD_YIELD 1 # define ACE_LACKS_PTHREAD_ATTR_SETSTACK +#if CYGWIN_VERSION_API_MINOR < 207 // In the 1.5.9 release of Cygwin the pthread_kill gives an access violation // so for the time being we say Cygwin doesn't support pthread_kill. # define ACE_LACKS_PTHREAD_KILL +#endif #endif /* ACE_MT_SAFE */ |