From a546438966f2ed74f469d8dab9731d01237b5a9d Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 4 Nov 2005 10:42:46 +0000 Subject: ChangeLogTag: Fri Nov 4 10:33:12 UTC 2005 Johnny Willemsen --- ace/os_include/sys/os_un.h | 2 +- include/makeinclude/platform_vxworks6.1.GNU | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ace/os_include/sys/os_un.h b/ace/os_include/sys/os_un.h index 9a04b4b7583..5f3b7fe69f0 100644 --- a/ace/os_include/sys/os_un.h +++ b/ace/os_include/sys/os_un.h @@ -36,7 +36,7 @@ extern "C" { #endif /* __cplusplus */ -#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600) +#if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x600) struct sockaddr_un { short sun_family; // AF_UNIX. char sun_path[108]; // path name. diff --git a/include/makeinclude/platform_vxworks6.1.GNU b/include/makeinclude/platform_vxworks6.1.GNU index 7d3dbf5bd9e..34a1cb2131b 100644 --- a/include/makeinclude/platform_vxworks6.1.GNU +++ b/include/makeinclude/platform_vxworks6.1.GNU @@ -1,5 +1,5 @@ # $Id$ -# VxWorks 5.5.x (x > 0). +# VxWorks 6.1 #### Notes: #### 1) This file requires that the WIND_BASE and WIND_HOST_TYPE environment @@ -70,7 +70,7 @@ ifeq (,$(PERL_PATH)) endif # ! PERL_PATH ifeq ($(VXWORKS_VERSION_FLAG),) - VXWORKS_VERSION_FLAG = -DACE_VXWORKS=0x551 + VXWORKS_VERSION_FLAG = -DACE_VXWORKS=0x610 endif # VXWORKS_VERSION_FLAG ifeq ($(TOOL),) -- cgit v1.2.1