diff options
Diffstat (limited to 'ace/config-win32-common.h')
| -rw-r--r-- | ace/config-win32-common.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h index cfd78ba0542..029db65fc83 100644 --- a/ace/config-win32-common.h +++ b/ace/config-win32-common.h @@ -87,14 +87,9 @@ #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_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE<CLASS, LOCK>; #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* @@ -186,14 +181,14 @@ // that can be transferred by the scatter/gather type of I/O // functions, e.g., WSASend and WSARecv. We are arbitrarily setting // this to be 1k for now. The typically use case is to create an I/O -// vector array of size ACE_IOV_MAX on the stack and then filled in. Note -// that we probably don't want too big a value for ACE_IOV_MAX since it +// vector array of size IOV_MAX on the stack and then filled in. Note +// that we probably don't want too big a value for IOV_MAX since it // may mostly go to waste or the size of the activation record may // become excessively large. // -#if !defined (ACE_IOV_MAX) -# define ACE_IOV_MAX 1024 -#endif /* ACE_IOV_MAX */ +#if !defined (IOV_MAX) +# define IOV_MAX 1024 +#endif /* IOV_MAX */ #if !defined (ACE_HAS_WINCE) // Platform supports pread() and pwrite() @@ -511,7 +506,6 @@ typedef unsigned long long ACE_UINT64; #define ACE_SIZEOF_WCHAR 2 #define ACE_HAS_MUTEX_TIMEOUTS #define ACE_LACKS_STRUCT_DIR -#define ACE_LACKS_MKSTEMP #include "ace/post.h" #endif /* ACE_CONFIG_WIN32_COMMON_H */ |