summaryrefslogtreecommitdiff
path: root/ace/OS.h
diff options
context:
space:
mode:
authorgonzo <gonzo@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-06-08 08:00:12 +0000
committergonzo <gonzo@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-06-08 08:00:12 +0000
commit907c9dbc4c4dd6ed06de9bc75537550ee192521c (patch)
treee71232d934123b28a8ad06d33681fe7ddecf680f /ace/OS.h
parente49857037f7f63debb04f3d0ac314bb233dcab75 (diff)
downloadATCD-907c9dbc4c4dd6ed06de9bc75537550ee192521c.tar.gz
Added initial support for Borland C++ Builder
Diffstat (limited to 'ace/OS.h')
-rw-r--r--ace/OS.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/ace/OS.h b/ace/OS.h
index f0e9b2de4cc..8ffc414cafc 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -360,20 +360,22 @@
// First, we define how to properly export/import objects.
#if defined (ACE_WIN32) // Only Win32 needs special treatment.
-# if !defined (_MSC_VER) /* Mark classes as exported, Borland. */
+# if defined(_MSC_VER) || (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530)
+/* Microsoft, Borland C++ Builder: */
+# 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_IMPORT_SINGLETON_DECLARATION(T) extern template class T
+# define ACE_PROPER_SINGLETON_INSTANTIATION(T) template class T
+# else /* defined(_MSC_VER) || (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) */
+/* Non-Microsoft, other versions of Borland: */
# define ACE_Proper_Export_Flag _export
# define ACE_Proper_Import_Flag _import
// @@ Don't know how to handle this when using Borland's compilers.
# define ACE_EXPORT_SINGLETON_DECLARATION(T)
# define ACE_IMPORT_SINGLETON_DECLARATION(T)
# define ACE_PROPER_SINGLETON_INSTANTIATION(T)
-# else /* Microsoft: */
-# 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_IMPORT_SINGLETON_DECLARATION(T) extern template class T
-# define ACE_PROPER_SINGLETON_INSTANTIATION(T) template class T
-# endif /* !_MSC_VER */
+# endif /* defined(_MSC_VER) || (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) */
#else /* ! ACE_WIN32 */
# define ACE_Proper_Export_Flag
# define ACE_Proper_Import_Flag