ChangeLogTag: Wed Jan 4 08:24:12 UTC 2006 Johnny Willemsen <jwilemsen@remedy.nl>

13 files changed, 18 insertions, 23 deletions

diff --git a/ace/OS_NS_Thread.h b/ace/OS_NS_Thread.h
index b0b9e3570a8..387241d044d 100644
--- a/ace/OS_NS_Thread.h
+++ b/ace/OS_NS_Thread.h
@@ -853,9 +853,6 @@ typedef int ACE_Sched_Priority;
 
 # if !defined (ACE_DEFAULT_SYNCH_TYPE)
 #   if defined (ACE_VXWORKS)
-#     if (ACE_VXWORKS == 0x610)
-#       include /**/ <semLibCommon.h>
-#     endif
       // Types include these options: SEM_Q_PRIORITY, SEM_Q_FIFO,
       // SEM_DELETE_SAFE, and SEM_INVERSION_SAFE.  SEM_Q_FIFO is
       // used as the default because that is VxWorks' default.
diff --git a/ace/OS_NS_dlfcn.inl b/ace/OS_NS_dlfcn.inl
index a53dea1fb09..ece6440b79c 100644
--- a/ace/OS_NS_dlfcn.inl
+++ b/ace/OS_NS_dlfcn.inl
@@ -94,7 +94,7 @@ ACE_OS::dlerror (void)
 #   else
   return const_cast <char *> (err);
 #   endif /* ACE_USES_WCHAR */
-# elif defined (__hpux) || defined (VXWORKS)
+# elif defined (__hpux) || defined (ACE_VXWORKS)
   ACE_OSCALL_RETURN (::strerror(errno), char *, 0);
 # elif defined (ACE_WIN32)
   static ACE_TCHAR buf[128];
diff --git a/ace/OS_NS_stropts.inl b/ace/OS_NS_stropts.inl
index 84f14d8ec24..59f1035074e 100644
--- a/ace/OS_NS_stropts.inl
+++ b/ace/OS_NS_stropts.inl
@@ -114,7 +114,7 @@ ACE_OS::ioctl (ACE_HANDLE handle,
 #if defined (ACE_WIN32)
   ACE_SOCKET sock = (ACE_SOCKET) handle;
   ACE_SOCKCALL_RETURN (::ioctlsocket (sock, cmd, reinterpret_cast<unsigned long *> (val)), int, -1);
-#elif defined (VXWORKS)
+#elif defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x620)
   ACE_OSCALL_RETURN (::ioctl (handle, cmd, reinterpret_cast<int> (val)),
                      int, -1);
 #elif defined (ACE_PSOS)
diff --git a/ace/OS_NS_sys_socket.inl b/ace/OS_NS_sys_socket.inl
index 2ecbfd2c380..71f3b2f3b28 100644
--- a/ace/OS_NS_sys_socket.inl
+++ b/ace/OS_NS_sys_socket.inl
@@ -78,7 +78,7 @@ ACE_OS::accept (ACE_HANDLE handle,
        addr = (sockaddr *) &fake_addr;
        *addrlen = sizeof fake_addr;
      }
-#    endif /* VXWORKS */
+#    endif /* ACE_HAS_BROKEN_ACCEPT_ADDR */
   ACE_HANDLE ace_result = ::accept ((ACE_SOCKET) handle,
                                     addr,
                                     (ACE_SOCKET_LEN *) addrlen);
@@ -637,7 +637,7 @@ ACE_OS::sendto (ACE_HANDLE handle,
                 int addrlen)
 {
   ACE_OS_TRACE ("ACE_OS::sendto");
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS)
   ACE_SOCKCALL_RETURN (::sendto ((ACE_SOCKET) handle,
                                  const_cast <char *> (buf),
                                  len,
@@ -673,7 +673,7 @@ ACE_OS::sendto (ACE_HANDLE handle,
                                  addrlen),
                        ssize_t, -1);
 #  endif /* ACE_WIN32 */
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 }
 
 ACE_INLINE ssize_t
diff --git a/ace/TTY_IO.cpp b/ace/TTY_IO.cpp
index 4a58bec4930..06122aad777 100644
--- a/ace/TTY_IO.cpp
+++ b/ace/TTY_IO.cpp
@@ -15,6 +15,7 @@ ACE_RCSID (ace,
            TTY_IO,
            "$Id$")
 
+#if defined (ACE_HAS_TERMIOS) || defined (ACE_HAS_TERMIO)
 namespace
 {
   const char ACE_TTY_IO_ODD[]   = "odd";
@@ -24,6 +25,7 @@ namespace
   const char ACE_TTY_IO_SPACE[] = "space";
 #endif /* ACE_WIN32 */
 }
+#endif
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/ace/config-vxworks6.2.h b/ace/config-vxworks6.2.h
index 36a4b9ea504..a2d552568e0 100644
--- a/ace/config-vxworks6.2.h
+++ b/ace/config-vxworks6.2.h
@@ -66,10 +66,6 @@
 #   define ACE_LACKS_PRAGMA_ONCE
 # endif /* ! ACE_LACKS_PRAGMA_ONCE */
 
-  // Diab doesn't support VxWorks' iostream libraries.
-# define ACE_LACKS_IOSTREAM_TOTALLY
-# define ACE_LACKS_ACE_IOSTREAM
-
 # define ACE_HAS_STANDARD_CPP_LIBRARY 1
 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 # define ACE_HAS_USING_KEYWORD
diff --git a/ace/os_include/os_dirent.h b/ace/os_include/os_dirent.h
index 9564634348e..f33e63c3842 100644
--- a/ace/os_include/os_dirent.h
+++ b/ace/os_include/os_dirent.h
@@ -27,7 +27,7 @@
 #include "ace/os_include/sys/os_types.h"
 #include "ace/os_include/os_limits.h"
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620)
 #  include "ace/os_include/os_unistd.h"  // VxWorks needs this to compile
 #endif /* VXWORKS */
 
@@ -111,7 +111,7 @@ int scandir (const char *,
              int (*) (const struct dirent *),
              int (*) (const void *, const void *));
 #endif /* ACE_LACKS_SCANDIR_PROTOTYPE */
-    
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ace/os_include/os_fcntl.h b/ace/os_include/os_fcntl.h
index 0d456c06043..275d131bb8f 100644
--- a/ace/os_include/os_fcntl.h
+++ b/ace/os_include/os_fcntl.h
@@ -31,10 +31,10 @@
 # include /**/ <fcntl.h>
 #endif /* !ACE_LACKS_FCNTL_H */
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620)
 // for creat(), open()
 #  include /**/ <ioLib.h>
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
diff --git a/ace/os_include/os_limits.h b/ace/os_include/os_limits.h
index 27be31af2b4..abbfb428614 100644
--- a/ace/os_include/os_limits.h
+++ b/ace/os_include/os_limits.h
@@ -37,9 +37,9 @@
 
 // On VxWorks _POSIX_TIMER_MAX is defined in time.h, report this to WindRiver
 // support.
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620)
 #  include /**/ <time.h>
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
diff --git a/ace/os_include/os_netdb.h b/ace/os_include/os_netdb.h
index eee766dc62f..b02ff121d63 100644
--- a/ace/os_include/os_netdb.h
+++ b/ace/os_include/os_netdb.h
@@ -39,7 +39,7 @@
 #  endif /* ACE_HAS_STL_QUEUE_CONFLICT */
 #endif /* !ACE_LACKS_NETDB_H */
 
-#if defined (ACE_VXWORKS)
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620)
 #  include /**/ <hostLib.h>
 #endif /* ACE_VXWORKS */
 
diff --git a/ace/os_include/os_stropts.h b/ace/os_include/os_stropts.h
index e28b672f560..b63cf5d964a 100644
--- a/ace/os_include/os_stropts.h
+++ b/ace/os_include/os_stropts.h
@@ -72,10 +72,10 @@
 #  endif /* AIX */
 #endif /* ACE_HAS_STREAMS */
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS)
 // for ioctl()
 #  include /**/ <ioLib.h>
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
diff --git a/ace/os_include/sys/os_socket.h b/ace/os_include/sys/os_socket.h
index c2000721289..422ed15dec7 100644
--- a/ace/os_include/sys/os_socket.h
+++ b/ace/os_include/sys/os_socket.h
@@ -36,7 +36,7 @@
 #  endif /* ACE_HAS_AIX_BROKEN_SOCKET_HEADER */
 #endif /* !ACE_LACKS_SYS_SOCKET_H */
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620)
 #  include /**/ <sockLib.h>
 #endif /* VXWORKS */
 
diff --git a/ace/os_include/sys/os_un.h b/ace/os_include/sys/os_un.h
index 5f3b7fe69f0..a9bf2457dc1 100644
--- a/ace/os_include/sys/os_un.h
+++ b/ace/os_include/sys/os_un.h
@@ -41,7 +41,7 @@ struct sockaddr_un {
   short sun_family;    // AF_UNIX.
   char  sun_path[108]; // path name.
 };
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 
 
 #ifdef __cplusplus