diff options
| -rw-r--r-- | ChangeLog-99b | 16 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | ace/OS.i | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 21fa8e7b0b5..e6ae7019296 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,19 @@ +Tue Jul 6 15:04:49 1999 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/OS.i (sigwait): Fixed a problem with macro-itis and GCC. The + following macro + + # if (__FreeBSD__ < 3) || defined (CHORUS) || defined (ACE_PSOS) + + was always evaluating to true, even when we're not on FreeBSD!. + The following macro works around this: + + # if (defined (__FreeBSD__) && (__FreeBSD__ < 3)) || + defined (CHORUS) || defined (ACE_PSOS) + + Thanks to Elias Sreih <sealstd1@nortelnetworks.com> for + reporting this and Carlos for suggesting the workaround. + Tue Jul 6 11:39:59 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ace/OS.i: Updated the comment for ACE_ADAPT_RETVAL to @@ -22,6 +22,7 @@ Michael Kircher <mlkirche@trick.informatik.uni-stuttgart.de> Yamuna Krishnamurthy <yamuna@cs.wustl.edu> Fred Kuhns <fredk@cs.wustl.edu> David Levine <levine@cs.wustl.edu> +Mike Moran <mm4@cs.wustl.edu> Balachandran Natarajan <bala@cs.wustl.edu> Kirthika Parameswaran <kirthika@cs.wustl.edu> Carlos O'Ryan <coryan@cs.wustl.edu> @@ -6730,7 +6730,7 @@ ACE_OS::sigwait (sigset_t *set, int *sig) if (sig == 0) sig = &local_sig; #if defined (ACE_HAS_THREADS) -# if (__FreeBSD__ < 3) || defined (CHORUS) || defined (ACE_PSOS) +# if (defined (__FreeBSD__) && (__FreeBSD__ < 3)) || defined (CHORUS) || defined (ACE_PSOS) ACE_UNUSED_ARG (set); ACE_NOTSUP_RETURN (-1); # elif (defined (ACE_HAS_STHREADS) && !defined (_POSIX_PTHREAD_SEMANTICS)) |