summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-11-04 10:42:46 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-11-04 10:42:46 +0000
commit8dfdd976f134d8d024fff208a2b22bc77bb004c8 (patch)
tree6d15e91a99f51771b98bc37fda39b0d731ce34df
parent2d1f7be113c2cd907d274d8f0fc10ab3912169e5 (diff)
downloadATCD-8dfdd976f134d8d024fff208a2b22bc77bb004c8.tar.gz
ChangeLogTag: Fri Nov 4 10:33:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ace/os_include/sys/os_un.h2
-rw-r--r--include/makeinclude/platform_vxworks6.1.GNU4
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),)