From db80a5c22510d9464a6d39301edee18007fef6dd Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 17 Dec 2004 12:21:59 +0000 Subject: ChangeLogTag: Fri Dec 17 12:21:12 UTC 2004 Johnny Willemsen --- ChangeLog | 5 +++++ ace/OS.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ab6ffb2b8ed..cb58419a212 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Dec 17 12:21:12 UTC 2004 Johnny Willemsen + + * ace/OS.h: + Also on VxWorks include os_un.h + Fri Dec 17 11:31:12 UTC 2004 Johnny Willemsen * ace/OS_NS_sys_socket.inl: diff --git a/ace/OS.h b/ace/OS.h index 14f86e2a4ae..4d73985e244 100644 --- a/ace/OS.h +++ b/ace/OS.h @@ -305,7 +305,7 @@ class ACE_Timeout_Manager; # include "ace/os_include/os_limits.h" // -# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) && !defined (VXWORKS) +# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) # include "ace/os_include/sys/os_un.h" # endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ -- cgit v1.2.1