diff options
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ChangeLog | 16 | ||||
| -rw-r--r-- | ACE/ace/POSIX_CB_Proactor.cpp | 4 | ||||
| -rw-r--r-- | ACE/ace/POSIX_CB_Proactor.h | 4 | ||||
| -rw-r--r-- | ACE/ace/Proactor.cpp | 6 | ||||
| -rw-r--r-- | ACE/ace/config-freebsd.h | 1 | ||||
| -rw-r--r-- | ACE/ace/config-lynxos.h | 1 | ||||
| -rw-r--r-- | ACE/tests/Proactor_Test.cpp | 2 | ||||
| -rw-r--r-- | ACE/tests/Proactor_Test_IPV6.cpp | 2 |
8 files changed, 27 insertions, 9 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 6cf696f0262..6afadc5b8a1 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,19 @@ +Thu Feb 1 11:21:32 UTC 2007 Olli Savia <ops@iki.fi> + + * ace/POSIX_CB_Proactor.h: + * ace/POSIX_CB_Proactor.cpp: + * ace/Proactor.cpp: + * ace/config-freebsd.h: + * ace/config-lynxos.h: + + Introduced a new feature test macro ACE_HAS_BROKEN_SIGEVENT_STRUCT + to make POSIX_CB_Proactor compile on FreeBSD 7.0-CURRENT. + + * tests/Proactor_Test.cpp: + * tests/Proactor_Test_IPV6.cpp: + + Modified due to changes above. + Thu Feb 1 08:05:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Message_Queue.{h,cpp,inl}: diff --git a/ACE/ace/POSIX_CB_Proactor.cpp b/ACE/ace/POSIX_CB_Proactor.cpp index 1ea8da21875..3590c9cc270 100644 --- a/ACE/ace/POSIX_CB_Proactor.cpp +++ b/ACE/ace/POSIX_CB_Proactor.cpp @@ -2,7 +2,7 @@ #include "ace/POSIX_CB_Proactor.h" -#if defined (ACE_HAS_AIO_CALLS) && !defined(__Lynx__) && !defined (__FreeBSD__) +#if defined (ACE_HAS_AIO_CALLS) && !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT) #include "ace/Task_T.h" #include "ace/Log_Msg.h" @@ -181,4 +181,4 @@ ACE_POSIX_CB_Proactor::handle_events_i (u_long milli_seconds) ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_HAS_AIO_CALLS && !__Lynx__ && !__FreeBSD__ */ +#endif /* ACE_HAS_AIO_CALLS && !ACE_HAS_BROKEN_SIGEVENT_STRUCT */ diff --git a/ACE/ace/POSIX_CB_Proactor.h b/ACE/ace/POSIX_CB_Proactor.h index 17b487fb2dd..2fd70729dfb 100644 --- a/ACE/ace/POSIX_CB_Proactor.h +++ b/ACE/ace/POSIX_CB_Proactor.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_HAS_AIO_CALLS) && !defined(__Lynx__) && !defined (__FreeBSD__) +#if defined (ACE_HAS_AIO_CALLS) #include "ace/Synch_Traits.h" #include "ace/Thread_Semaphore.h" @@ -96,5 +96,5 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_HAS_AIO_CALLS && !__Lynx__ && !__FreeBSD__ */ +#endif /* ACE_HAS_AIO_CALLS */ #endif /* ACE_POSIX_CB_PROACTOR_H*/ diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp index 481c7eef5b5..da46649dc33 100644 --- a/ACE/ace/Proactor.cpp +++ b/ACE/ace/Proactor.cpp @@ -318,8 +318,8 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation, ACE_NEW (implementation, ACE_POSIX_AIOCB_Proactor); # elif defined (ACE_POSIX_SIG_PROACTOR) ACE_NEW (implementation, ACE_POSIX_SIG_Proactor); -# else /* Default order: CB (but not Lynx), SIG, AIOCB */ -# if !defined (__Lynx) && !defined (__FreeBSD__) +# else /* Default order: CB, SIG, AIOCB */ +# if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT) ACE_NEW (implementation, ACE_POSIX_CB_Proactor); # else # if defined(ACE_HAS_POSIX_REALTIME_SIGNALS) @@ -327,7 +327,7 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation, # else ACE_NEW (implementation, ACE_POSIX_AIOCB_Proactor); # endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ -# endif /* !__Lynx && !__FreeBSD__ */ +# endif /* !ACE_HAS_BROKEN_SIGEVENT_STRUCT */ # endif /* ACE_POSIX_AIOCB_PROACTOR */ #elif (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) // WIN_Proactor. diff --git a/ACE/ace/config-freebsd.h b/ACE/ace/config-freebsd.h index 28c7744900e..c0a4fd7fcc3 100644 --- a/ACE/ace/config-freebsd.h +++ b/ACE/ace/config-freebsd.h @@ -266,6 +266,7 @@ typedef union sigval sigval_t; #if (__FreeBSD_version < 700007) # define ACE_HAS_SIGVAL_SIGVAL_INT +# define ACE_HAS_BROKEN_SIGEVENT_STRUCT #endif #if (__FreeBSD_version >= 700028) diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h index d07d13a273d..99b6e42bc6f 100644 --- a/ACE/ace/config-lynxos.h +++ b/ACE/ace/config-lynxos.h @@ -38,6 +38,7 @@ #define ACE_HAS_ALLOCA #define ACE_HAS_ALLOCA_H #define ACE_HAS_AUTOMATIC_INIT_FINI +#define ACE_HAS_BROKEN_SIGEVENT_STRUCT #define ACE_HAS_CHARPTR_SHMAT #define ACE_HAS_CHARPTR_SHMDT #define ACE_HAS_CLOCK_GETTIME diff --git a/ACE/tests/Proactor_Test.cpp b/ACE/tests/Proactor_Test.cpp index 28a5dbcff8a..160e502d1ca 100644 --- a/ACE/tests/Proactor_Test.cpp +++ b/ACE/tests/Proactor_Test.cpp @@ -20,7 +20,7 @@ ACE_RCSID (tests, Proactor_Test, "$Id$") -#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)) +#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)) && !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT) // This only works on Win32 platforms and on Unix platforms // supporting POSIX aio calls. diff --git a/ACE/tests/Proactor_Test_IPV6.cpp b/ACE/tests/Proactor_Test_IPV6.cpp index 003f6915612..2358928891f 100644 --- a/ACE/tests/Proactor_Test_IPV6.cpp +++ b/ACE/tests/Proactor_Test_IPV6.cpp @@ -20,7 +20,7 @@ ACE_RCSID (tests, Proactor_Test, "$Id$") -#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)) +#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)) && !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT) // This only works on Win32 platforms and on Unix platforms // supporting POSIX aio calls. |