diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | configure.ac | 32 |
2 files changed, 30 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog index 380f709fd8e..37da6408449 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Tue Jun 15 23:31:51 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * configure.ac: + Changed ACE_HAS_UCONTEXT_T test to include <signal.h> and + <ucontext.h> (if it exists). + This fixes bugzilla bug 1844. + + * configure.ac: + Set ACE_SIG_MACROS if any of sigemptyset, sigdelset, sigaddset, + sigdelset, or sigismember are macros. + This fixes bugzilla bug 1836. + Wed Jun 16 06:13:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * ace/TLI.h: diff --git a/configure.ac b/configure.ac index 4b40447eb9a..37d2515275a 100644 --- a/configure.ac +++ b/configure.ac @@ -1121,16 +1121,20 @@ ACE_CHECK_TYPE([key_t],[sys/types.h],,[AC_DEFINE([ACE_LACKS_KEY_T])]) ACE_CHECK_TYPE([ssize_t],[sys/types.h],[AC_DEFINE([ACE_HAS_SSIZE_T])],) ACE_CHECK_TYPE([u_longlong_t],[sys/types.h],,[AC_DEFINE([ACE_LACKS_U_LONGLONG_T])]) ACE_CHECK_TYPE([pri_t],[sys/types.h],,[AC_DEFINE([ACE_LACKS_PRI_T])]) -ACE_CHECK_TYPE([ucontext_t],[ucontext.h], - [ - AC_DEFINE([ACE_HAS_UCONTEXT_T]) - ], - [ - dnl Some platforms define ucontext_t in <sys/ucontext.h>, but ACE - dnl doesn't explicitly include that header. However, it is very likely - dnl that <signal.h> does, either directly or indirectly. - ACE_CHECK_TYPE([ucontext_t],[signal.h],[AC_DEFINE([ACE_HAS_UCONTEXT_T])]) - ]) + +dnl Some platforms define ucontext_t in <sys/ucontext.h>, but ACE +dnl doesn't explicitly include that header. However, it is very +dnl likely that <signal.h> does, either directly or indirectly. +AC_CHECK_TYPE([ucontext_t], + AC_DEFINE([ACE_HAS_UCONTEXT_T]), + , + [ +#include <signal.h> +#ifndef ACE_LACKS_UCONTEXT_H +# include <ucontext.h> +#endif +]) + ACE_CHECK_TYPE([wchar_t],[wchar.h],, [ ACE_CHECK_TYPE([wchar_t],[sys/types.h],,[AC_DEFINE([ACE_LACKS_WCHAR_T])]) @@ -5982,10 +5986,10 @@ ACE_CACHE_CHECK([for sig{empty fill add del}set macros], #endif #include <signal.h> -#if defined (sigemptyset) && \ - defined (sigfillset) && \ - defined (sigaddset) && \ - defined (sigdelset) && \ +#if defined (sigemptyset) || \ + defined (sigfillset) || \ + defined (sigaddset) || \ + defined (sigdelset) || \ defined (sigismember) ACE_SIG_MACROS #endif |