diff options
| author | Steve Huston <shuston@riverace.com> | 2004-04-21 17:47:06 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2004-04-21 17:47:06 +0000 |
| commit | caffc64516acf71f74decd30c6ca1fc23f3b33d2 (patch) | |
| tree | 8f442f708cbfe8efde20ac35dcc59799216e31f8 | |
| parent | cc0ec985c955a6aaf75f5da1d292df57e1d32970 (diff) | |
| download | ATCD-caffc64516acf71f74decd30c6ca1fc23f3b33d2.tar.gz | |
ChangeLogTag:Wed Apr 21 13:36:41 2004 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ace/os_include/os_time.h | 7 |
2 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 1a09bd33694..4dca05ffa67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Wed Apr 21 13:36:41 2004 Steve Huston <shuston@riverace.com> + + * ace/os_include/os_time.h: Reverted this change: + Thu Apr 15 17:56:29 2004 Steve Huston <shuston@riverace.com> + and directly include <sys/time.h> instead. Although the Apr 15 + change fixed the g++ build on HP-UX, it revived a compile error + for the aC++ build wherein the ACE_OS::sigaction() method would + not compile, apparantly due to some confusion over partially-defined + struct sigaction in some inlined situations. I have no idea why, + but at this point, both the aC++ and g++ builds are quiet. + Tue Apr 20 12:47:32 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * ace/os_include/sys/os_shm.h: diff --git a/ace/os_include/os_time.h b/ace/os_include/os_time.h index 2e2936235fe..17d945a7074 100644 --- a/ace/os_include/os_time.h +++ b/ace/os_include/os_time.h @@ -29,7 +29,12 @@ // To get the proper select() signature, this is required for HP-UX, and // maybe other platforms that offer both int and fdset forms of select(). -#include "ace/os_include/sys/os_time.h" +// For HP-UX, sys/time.h must be included before time.h, or +// _XOPEN_SOURCE_EXTENDED must be defined. It's not nice to require +// the preprocessor macro, so we force our select() preference this way. +#if !defined (ACE_LACKS_SYS_TIME_H) +# include /**/ <sys/time.h> +#endif /* !ACE_LACKS_SYS_TIME_H */ #if !defined (ACE_LACKS_TIME_H) # include /**/ <time.h> |