ChangeLogTag:Wed Jun 18 15:19:17 UTC 2003 Don Hinton <dhinton@dresystems.com>

15 files changed, 112 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 4b6500577e8..5e9d82067b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+Wed Jun 18 15:19:17 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * ace/OS.h:
+        * ace/os_include/os_fcntl.h:
+        * ace/os_include/os_netdb.h:
+        * ace/os_include/os_semaphore.h:
+        * ace/os_include/os_signal.h:
+        * ace/os_include/os_stdio.h:
+        * ace/os_include/os_stdlib.h:
+        * ace/os_include/os_stropts.h:
+        * ace/os_include/os_unistd.h:
+        * ace/os_include/arpa/os_inet.h:
+        * ace/os_include/sys/select.h:
+        * ace/os_include/sys/os_socket.h:
+          Moved the following VxWorks includes from OS.h as noted:
+          semLib.h to os_semaphore.h; ioLib.h to os_fcntl.h, os_stdio.h,
+          os_stropts.h, os_unistd.h; hostLib.h to os_netdb.h; sigLib.h to
+          os_signal.h; envLib.h to os_stdlib.h; inetLib.h to
+          arpa/os_inet.h; selectLib.h to sys/select.h; sockLib.h to
+          sys/socket.h.
+
+        * ace/OS.h:
+          Commented out remLib.h and sysLib.h since they don't appear to
+          be used by ACE at all.
+
+        * ace/OS.h:
+        * ace/os_include/sys/os_un.h:
+          Moved sockaddr_un declaration to sys/os_un.h.
+
+        * ace/OS.h:
+        * ace/os_include/os_signal.h:
+          Moved NSIG definition to os_signal.h.
+
+        * ace/config-vxworks5.x.h:
+          Added following ACE_LACKS_* defines: STDINT_H, INTTYPS_H,
+          UNISTD_H, SYS_SELECT_H, SYS_TIME_H, SYS_RESOURCE_H, DLFCN_H,
+          SYS_UIO_H, SYS_IPC_H, SYS_SEM_H, STROPTS_H, and SYS_MSG_H.
+
 Wed Jun 18 14:00:00 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
         * ace/config-openbsd.h:
diff --git a/ace/OS.h b/ace/OS.h
index 4458a329a7f..472f28a7676 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -688,28 +688,10 @@ typedef u_int ACE_thread_key_t;
 
 
 #   elif defined (VXWORKS)
-// For mutex implementation using mutual-exclusion semaphores (which
-// can be taken recursively).
-#     include /**/ <semLib.h>
-
-#     include /**/ <envLib.h>
-#     include /**/ <hostLib.h>
-#     include /**/ <ioLib.h>
-#     include /**/ <remLib.h>
-#     include /**/ <selectLib.h>
-#     include /**/ <sigLib.h>
-#     include /**/ <sockLib.h>
-#     include /**/ <sysLib.h>
+//#     include /**/ <remLib.h> I don't see where this is used...
+//#     include /**/ <sysLib.h>  this is for board specific routines (not used by ACE)
 #     include /**/ <taskLib.h>
 #     include /**/ <taskHookLib.h>
-#     include /**/ <inetLib.h>
-extern "C"
-struct sockaddr_un {
-  short sun_family;    // AF_UNIX.
-  char  sun_path[108]; // path name.
-};
-
-#     define NSIG (_NSIGS + 1)
 
 // task options:  the other options are either obsolete, internal, or for
 // Fortran or Ada support
diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h
index da67214da25..43c34ded458 100644
--- a/ace/config-vxworks5.x.h
+++ b/ace/config-vxworks5.x.h
@@ -180,6 +180,20 @@
 # define ACE_VXWORKS_SPARE spare4
 #endif /* ! ACE_VXWORKS_SPARE */
 
+#define ACE_LACKS_STDINT_H
+#define ACE_LACKS_INTTYPS_H
+#define ACE_LACKS_UNISTD_H
+#define ACE_LACKS_SYS_SELECT_H
+#define ACE_LACKS_SYS_TIME_H
+#define ACE_LACKS_SYS_RESOURCE_H
+#define ACE_LACKS_DLFCN_H
+#define ACE_LACKS_SYS_UIO_H
+#define ACE_LACKS_SYS_IPC_H
+#define ACE_LACKS_SYS_SEM_H
+#define ACE_LACKS_STROPTS_H
+#define ACE_LACKS_SYS_MSG_H
+
+
 // Some string things
 #define ACE_LACKS_WCSCAT
 #define ACE_LACKS_WCSCHR
diff --git a/ace/os_include/arpa/os_inet.h b/ace/os_include/arpa/os_inet.h
index 346f2a3f8a8..74bc794901f 100644
--- a/ace/os_include/arpa/os_inet.h
+++ b/ace/os_include/arpa/os_inet.h
@@ -32,6 +32,10 @@
    }
 #endif /* !ACE_LACKS_ARPA_INET_H */
 
+#if defined (VXWORKS)
+#  include /**/ <inetLib.h>
+#endif /* VXWORKS */
+
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"
diff --git a/ace/os_include/os_fcntl.h b/ace/os_include/os_fcntl.h
index b917fb4702e..a773df247f8 100644
--- a/ace/os_include/os_fcntl.h
+++ b/ace/os_include/os_fcntl.h
@@ -31,6 +31,11 @@
 # include /**/ <fcntl.h>
 #endif /* !ACE_LACKS_FCNTL_H */
 
+#if defined (VXWORKS)
+// for creat(), open()
+#  include /**/ <ioLib.h>
+#endif /* VXWORKS */
+
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"
diff --git a/ace/os_include/os_netdb.h b/ace/os_include/os_netdb.h
index f9bee102df1..c6eee2f1625 100644
--- a/ace/os_include/os_netdb.h
+++ b/ace/os_include/os_netdb.h
@@ -39,6 +39,10 @@
 #  endif /* ACE_HAS_STL_QUEUE_CONFLICT */
 #endif /* !ACE_LACKS_NETDB_H */
 
+#if defined (VXWORKS)
+#  include /**/ <hostLib.h>
+#endif /* VXWORKS */
+
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"
diff --git a/ace/os_include/os_semaphore.h b/ace/os_include/os_semaphore.h
index ee3e5187409..3f65ecd5d66 100644
--- a/ace/os_include/os_semaphore.h
+++ b/ace/os_include/os_semaphore.h
@@ -30,6 +30,10 @@
 # include /**/ <semaphore.h>
 #endif /* !ACE_LACKS_SEMAPHORE_H */
 
+#if defined (VXWORKS)
+#  include /**/ <semLib.h>
+#endif /* VXWORKS */
+
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"
diff --git a/ace/os_include/os_signal.h b/ace/os_include/os_signal.h
index 194afaebca1..4114ce288f0 100644
--- a/ace/os_include/os_signal.h
+++ b/ace/os_include/os_signal.h
@@ -50,6 +50,11 @@
 #  endif /* ACE_LACKS_SIGINFO_H */
 #endif /* ACE_HAS_SIGINFO_T */
 
+#if defined (VXWORKS)
+#  include /**/ <sigLib.h>
+#  define NSIG (_NSIGS + 1)
+#endif /* VXWORKS */
+
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"
diff --git a/ace/os_include/os_stdio.h b/ace/os_include/os_stdio.h
index 018c977c345..757b8aa6706 100644
--- a/ace/os_include/os_stdio.h
+++ b/ace/os_include/os_stdio.h
@@ -32,6 +32,11 @@
 #  include /**/ <stdio.h>
 #endif /* !ACE_LACKS_STDIO_H */
 
+#if defined (VXWORKS)
+// for remove(), rename()
+#  include /**/ <ioLib.h>
+#endif /* VXWORKS */
+
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"
diff --git a/ace/os_include/os_stdlib.h b/ace/os_include/os_stdlib.h
index 54fa99735a2..880ebad0d85 100644
--- a/ace/os_include/os_stdlib.h
+++ b/ace/os_include/os_stdlib.h
@@ -35,6 +35,10 @@
 #  include /**/ <stdlib.h>
 #endif /* !ACE_LACKS_STDLIB_H */
 
+#if defined (VXWORKS)
+#  include /**/ <envLib.h>
+#endif /* VXWORKS */
+
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"
diff --git a/ace/os_include/os_stropts.h b/ace/os_include/os_stropts.h
index 70bd60b9357..73ce17da61d 100644
--- a/ace/os_include/os_stropts.h
+++ b/ace/os_include/os_stropts.h
@@ -54,6 +54,11 @@
 #  include /**/ <stropts.h>
 #endif /* !ACE_LACKS_STROPTS_H */
 
+#if defined (VXWORKS)
+// for ioctl()
+#  include /**/ <ioLib.h>
+#endif /* VXWORKS */
+
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"
diff --git a/ace/os_include/os_unistd.h b/ace/os_include/os_unistd.h
index 8856fb86e74..e547c5040c8 100644
--- a/ace/os_include/os_unistd.h
+++ b/ace/os_include/os_unistd.h
@@ -40,6 +40,12 @@
 #  include /**/ <unistd.h>
 #endif /* !ACE_LACKS_UNISTD_H */
 
+#if defined (VXWORKS)
+// for unlink(), close(), read(), write(), lseek(), chdir(), getcwd(), getwd(), 
+// and isatty()
+#  include /**/ <ioLib.h>
+#endif /* VXWORKS */
+
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"
diff --git a/ace/os_include/sys/os_select.h b/ace/os_include/sys/os_select.h
index f5c84dd026b..361fff0eeb3 100644
--- a/ace/os_include/sys/os_select.h
+++ b/ace/os_include/sys/os_select.h
@@ -31,6 +31,10 @@
 #  include /**/ <sys/select.h>
 #endif /* !ACE_LACKS_SYS_SELECT_H */
 
+#if defined (VXWORKS)
+#  include /**/ <selectLib.h>
+#endif /* VXWORKS */
+
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"
diff --git a/ace/os_include/sys/os_socket.h b/ace/os_include/sys/os_socket.h
index 00a4ca2ad22..b7e3413fb30 100644
--- a/ace/os_include/sys/os_socket.h
+++ b/ace/os_include/sys/os_socket.h
@@ -43,6 +43,10 @@
 #  endif /* ACE_HAS_AIX_BROKEN_SOCKET_HEADER */
 #endif /* !ACE_LACKS_SYS_SOCKET_H */
 
+#if defined (VXWORKS)
+#  include /**/ <sockLib.h>
+#endif /* VXWORKS */
+
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"
diff --git a/ace/os_include/sys/os_un.h b/ace/os_include/sys/os_un.h
index 1576d4b1971..47f63aef105 100644
--- a/ace/os_include/sys/os_un.h
+++ b/ace/os_include/sys/os_un.h
@@ -36,6 +36,14 @@ extern "C"
 {
 #endif /* __cplusplus */
 
+#if defined (VXWORKS)
+struct sockaddr_un {
+  short sun_family;    // AF_UNIX.
+  char  sun_path[108]; // path name.
+};
+#endif /* VXWORKS */
+
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */