diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2002-09-01 08:16:44 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2002-09-01 08:16:44 +0000 |
| commit | 58eff58f4db0b12240b8c0265f640d923482243f (patch) | |
| tree | 6f0201cefdee4abcb4e59c61b1646fc4aa3b82a3 | |
| parent | 869a107bf4d924c5552196ee5de4d1fbccba8b69 (diff) | |
| download | ATCD-58eff58f4db0b12240b8c0265f640d923482243f.tar.gz | |
ChangeLogTag: Sun Sep 01 2002 08:18:12 UTC Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ace/Handle_Set.cpp | 7 | ||||
| -rw-r--r-- | ace/Task.cpp | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ace/Handle_Set.cpp b/ace/Handle_Set.cpp index 6e301925e4d..4982cc4f22e 100644 --- a/ace/Handle_Set.cpp +++ b/ace/Handle_Set.cpp @@ -12,12 +12,17 @@ ACE_RCSID(ace, Handle_Set, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_Handle_Set) +#if defined (__BORLANDC__) && !defined (ACE_WIN32) +// The Borland C++ compiler on Linux also doesn't have fds_bits, but has __fds_bits. +#define fds_bits __fds_bits +#endif + #if defined (linux) && __GLIBC__ > 1 && __GLIBC_MINOR__ >= 1 && !defined (_XOPEN_SOURCE) // XPG4.2 requires the fds_bits member name, so it is not enabled by // default on Linux/glibc-2.1.x systems. Instead use "__fds_bits." // Ugly, but "what are you going to do?" 8-) #define fds_bits __fds_bits -#endif /* linux && __GLIBC__ > 1 && __GLIBC_MINOR__ >= 1 && !_GNU_SOURCE */ +#endif /* linux && __GLIBC__ > 1 && __GLIBC_MINOR__ >= 1 && !_XOPEN_SOURCE */ void ACE_Handle_Set::dump (void) const diff --git a/ace/Task.cpp b/ace/Task.cpp index acefff92349..960977d84ae 100644 --- a/ace/Task.cpp +++ b/ace/Task.cpp @@ -202,12 +202,12 @@ ACE_Task_Base::svc_run (void *args) // Call the Task's svc() hook method. int svc_status = t->svc (); ACE_THR_FUNC_RETURN status; -#if defined (__BORLANDC__) || defined (__MINGW32__) || (defined (_MSC_VER) && (_MSC_VER <= 1200)) +#if (defined (__BORLANDC__) && (__BORLANDC__ < 0x570)) || defined (__MINGW32__) || (defined (_MSC_VER) && (_MSC_VER <= 1200)) // Some compilers complain about reinterpret_cast from int to unsigned long... status = ACE_static_cast (ACE_THR_FUNC_RETURN, svc_status); #else status = ACE_reinterpret_cast (ACE_THR_FUNC_RETURN, svc_status); -#endif /* __BORLANDC__ || __MINGW32__ || _MSC_VER <= 1200 */ +#endif /* (__BORLANDC__ < 0x570) || __MINGW32__ || _MSC_VER <= 1200 */ // If we changed this zero change the other if in OS.cpp Thread_Adapter::invoke #if 1 |