summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-11-04 10:37:44 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-11-04 10:37:44 +0000
commit2d1f7be113c2cd907d274d8f0fc10ab3912169e5 (patch)
tree328f8d165efa41821144a720c043ee3464672d0b
parent2aa8a3c1581b33d68390c7f83192d40897a3bc6b (diff)
downloadATCD-2d1f7be113c2cd907d274d8f0fc10ab3912169e5.tar.gz
ChangeLogTag: Fri Nov 4 10:33:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ChangeLog10
-rw-r--r--ace/os_include/sys/os_un.h2
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 834ec57ad6c..84aeb2c1ced 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Nov 4 10:33:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/config-vxworks6.1.h:
+ * include/makeinclude/platform_vxworks6.1.GNU:
+ New files for VxWorks 6.1. This is just a first draft version, a lot
+ of porting work has to be done
+
+ * ace/OS_NS_stdlib.cpp:
+ Fixed variable not used warning with VxWorks 6.1
+
Fri Nov 4 10:09:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/OS_NS_Thread.h:
diff --git a/ace/os_include/sys/os_un.h b/ace/os_include/sys/os_un.h
index 1b2e5aca9ef..9a04b4b7583 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 (VXWORKS)
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600)
struct sockaddr_un {
short sun_family; // AF_UNIX.
char sun_path[108]; // path name.