Wed Nov 22 09:07:12 2006 Johnny Willemsen <jwillemsen@remedy.nl>

10 files changed, 121 insertions, 100 deletions

diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp
index e65a1529849..63dd22fbdfb 100644
--- a/ACE/ace/INET_Addr.cpp
+++ b/ACE/ace/INET_Addr.cpp
@@ -660,12 +660,18 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[],
   : ACE_Addr (this->determine_type(), sizeof (inet_addr_))
 {
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
+#if !defined (ACE_LACKS_HTONL)
   this->reset ();
   if (this->set (port_name,
                  htonl (inet_address),
                  protocol) == -1)
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr")));
+#else
+  ACE_UNUSED_ARG (port_name);
+  ACE_UNUSED_ARG (inet_address);
+  ACE_UNUSED_ARG (protocol);
+#endif
 }
 #endif /* ACE_HAS_WCHAR */
 
diff --git a/ACE/ace/OS_NS_netdb.cpp b/ACE/ace/OS_NS_netdb.cpp
index 92a853b2895..a788714eefd 100644
--- a/ACE/ace/OS_NS_netdb.cpp
+++ b/ACE/ace/OS_NS_netdb.cpp
@@ -356,7 +356,7 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node)
 
   return 0;
 
-#elif defined (linux)
+#elif defined (linux) && !defined (ACE_LACKS_NETWORKING)
 
   struct ifreq ifr;
 
diff --git a/ACE/ace/OS_NS_string.inl b/ACE/ace/OS_NS_string.inl
index c1b8aef93e5..204ea5db435 100644
--- a/ACE/ace/OS_NS_string.inl
+++ b/ACE/ace/OS_NS_string.inl
@@ -525,7 +525,7 @@ ACE_INLINE wchar_t *
 ACE_OS::strtok (wchar_t *s, const wchar_t *tokens)
 {
 #if defined (ACE_HAS_3_PARAM_WCSTOK)
-  static wchar_t *lasts;
+  static wchar_t *lasts = 0;
   return ::wcstok (s, tokens, &lasts);
 #else
   return ::wcstok (s, tokens);
diff --git a/ACE/ace/Obstack.h b/ACE/ace/Obstack.h
index 511f7715f69..81b9f7ab105 100644
--- a/ACE/ace/Obstack.h
+++ b/ACE/ace/Obstack.h
@@ -21,7 +21,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_SINGLETON_DECLARATION (ACE_Obstack_T <char>;)
+ACE_EXPORT_SINGLETON_DECLARATION (ACE_Obstack_T <char>;)
 
 typedef ACE_Obstack_T<char> ACE_Obstack;
 
diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h
index 95a7a07d8c0..4b8c63c80b9 100644
--- a/ACE/ace/config-linux-common.h
+++ b/ACE/ace/config-linux-common.h
@@ -395,7 +395,12 @@
 
 #define ACE_HAS_VOIDPTR_MMAP
 
-#define ACE_HAS_NETLINK
+#if defined (ACE_LACKS_NETWORKING)
+# include "ace/config-posix-nonetworking.h"
+#else
+# define ACE_HAS_NETLINK
+# define ACE_HAS_GETIFADDRS
+#endif
 
 #if !defined (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO)
 // Detect if getsockname() and getpeername() returns random values in
diff --git a/ACE/ace/config-linux.h b/ACE/ace/config-linux.h
index 402ef191e16..ee3ca24eeeb 100644
--- a/ACE/ace/config-linux.h
+++ b/ACE/ace/config-linux.h
@@ -58,10 +58,6 @@
 
 #endif  /* ACE_MT_SAFE */
 
-// This is certainly true for newer distributions. I'm not sure how
-// far back this goes.
-#define ACE_HAS_GETIFADDRS
-
 #include /**/ "ace/post.h"
 
 #endif /* ACE_CONFIG_LINUX_H */
diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h
index 739ecee49c8..2bf6665c8e2 100644
--- a/ACE/ace/config-lynxos.h
+++ b/ACE/ace/config-lynxos.h
@@ -54,7 +54,6 @@
 #define ACE_HAS_MEMCHR
 #define ACE_HAS_MSG
 #define ACE_HAS_NONCONST_CLOCK_SETTIME
-#define ACE_HAS_NONCONST_GETBY
 #define ACE_HAS_NONCONST_MSGSND
 #define ACE_HAS_NONCONST_READV
 #define ACE_HAS_NONCONST_SELECT_TIMEVAL
@@ -79,26 +78,20 @@
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 #define ACE_HAS_TYPENAME_KEYWORD
 #define ACE_LACKS_CONST_TIMESPEC_PTR
-#define ACE_LACKS_GETOPT_PROTOTYPE
 #define ACE_LACKS_GETPGID
-#define ACE_LACKS_INET_ATON_PROTOTYPE
 #define ACE_LACKS_MADVISE
 #define ACE_LACKS_MKSTEMP_PROTOTYPE
 #define ACE_LACKS_MKTEMP_PROTOTYPE
 #define ACE_LACKS_PUTENV_PROTOTYPE
 #define ACE_LACKS_REALPATH
-#define ACE_LACKS_REGEX_H
 #define ACE_LACKS_RWLOCK_T
 #define ACE_LACKS_SCANDIR_PROTOTYPE
 #define ACE_LACKS_SETEGID
 #define ACE_LACKS_SETEUID
 #define ACE_LACKS_SIGINFO_H
-#define ACE_LACKS_STRCASECMP_PROTOTYPE
-#define ACE_LACKS_STRNCASECMP_PROTOTYPE
 #define ACE_LACKS_STRPTIME
 #define ACE_LACKS_SUSECONDS_T
 #define ACE_LACKS_SWAB_PROTOTYPE
-#define ACE_LACKS_SYS_SELECT_H
 #define ACE_LACKS_TIMESPEC_T
 #define ACE_LACKS_UCONTEXT_H
 #define ACE_LACKS_USECONDS_T
@@ -146,5 +139,25 @@
 #define ALIGNBYTES (sizeof(int) - 1)
 #define ALIGN(p) (((unsigned)p + ALIGNBYTES) & ~ALIGNBYTES)
 
+#if ACE_LYNXOS_MAJOR == 4 && ACE_LYNXOS_MINOR == 0
+# define ACE_LACKS_GETOPT_PROTOTYPE
+# define ACE_LACKS_INET_ATON_PROTOTYPE
+# define ACE_LACKS_REGEX_H
+# define ACE_LACKS_STRCASECMP_PROTOTYPE
+# define ACE_LACKS_STRNCASECMP_PROTOTYPE
+# define ACE_LACKS_SYS_SELECT_H
+# define ACE_HAS_NONCONST_GETBY
+#endif
+
+#if (ACE_LYNXOS_MAJOR > 4) || (ACE_LYNXOS_MAJOR == 4 && ACE_LYNXOS_MINOR >= 2)
+// LynxOS 4.2 additons
+# define ACE_HAS_POSIX_SEM_TIMEOUT
+# define ACE_HAS_MUTEX_TIMEOUTS
+#endif
+
+#if defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
+# define ACE_HAS_BROKEN_THREAD_KEYFREE
+#endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */
+
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-posix-nonetworking.h b/ACE/ace/config-posix-nonetworking.h
new file mode 100644
index 00000000000..c153f795a15
--- /dev/null
+++ b/ACE/ace/config-posix-nonetworking.h
@@ -0,0 +1,79 @@
+/* -*- C -*- */
+// $Id$
+
+/* The following configuration file is designed to work for RTEMS
+   platforms using GNU C.
+*/
+
+#ifndef ACE_CONFIG_POSIX_NONETWORKING_H
+#define ACE_CONFIG_POSIX_NONETWORKING_H
+
+// Missing header files
+# define ACE_LACKS_SYS_UIO_H
+# define ACE_LACKS_SYS_SOCKET_H
+# define ACE_LACKS_NETINET_IN_H
+# define ACE_LACKS_NETDB_H
+# define ACE_LACKS_ARPA_INET_H
+# define ACE_LACKS_SYS_SELECT_H
+# define ACE_LACKS_NET_IF_H
+# define ACE_LACKS_SYSLOG_H
+# define ACE_LACKS_SYS_UN_H
+# define ACE_LACKS_MEMORY_H
+# define ACE_LACKS_SYS_SYSCTL_H
+# define ACE_LACKS_NETINET_TCP_H
+
+// Missing types
+# define ACE_LACKS_IOVEC
+# define ACE_LACKS_IN_ADDR
+# define ACE_LACKS_SOCKADDR_IN
+# define ACE_LACKS_HOSTENT
+# define ACE_LACKS_SOCKADDR
+# define ACE_LACKS_IP_MREQ
+# define ACE_LACKS_PROTOENT
+# define ACE_LACKS_SERVENT
+# define ACE_LACKS_IFREQ
+
+// Missing methods
+# define ACE_LACKS_GETHOSTBYADDR
+# define ACE_LACKS_GETHOSTBYNAME
+# define ACE_LACKS_GETIPNODEBYADDR
+# define ACE_LACKS_LISTEN
+# define ACE_LACKS_BIND
+# define ACE_LACKS_NTOHL
+# define ACE_LACKS_HTONL
+# define ACE_LACKS_HTONS
+# define ACE_LACKS_NTOHS
+# define ACE_LACKS_SELECT
+# define ACE_LACKS_SOCKET
+# define ACE_LACKS_SHUTDOWN
+# define ACE_LACKS_SETSOCKOPT
+# define ACE_LACKS_INET_ATON
+# define ACE_LACKS_INET_ADDR
+# define ACE_LACKS_INET_NTOA
+# define ACE_LACKS_GET_BCAST_ADDR
+# define ACE_LACKS_GETSERVBYNAME
+# define ACE_LACKS_ACCEPT
+# define ACE_LACKS_CONNECT
+# define ACE_LACKS_GETPEERNAME
+# define ACE_LACKS_GETSOCKNAME
+# define ACE_LACKS_GETSOCKOPT
+# define ACE_LACKS_RECV
+# define ACE_LACKS_SEND
+# define ACE_LACKS_SENDTO
+# define ACE_LACKS_RECVFROM
+# define ACE_LACKS_RECVMSG
+# define ACE_LACKS_SENDMSG
+# define ACE_LACKS_GETHOSTBYADDR_R
+# define ACE_LACKS_GETPROTOBYNAME
+# define ACE_LACKS_GETPROTOBYNUMBER
+# define ACE_LACKS_GETSERVBYNAME
+# define ACE_LACKS_READV
+# define ACE_LACKS_WRITEV
+# define ACE_LACKS_SOCKETPAIR
+# undef ACE_HAS_MSG
+
+// Missing OS features
+# define ACE_LACKS_UNIX_SYSLOG
+# define ACE_LACKS_TCP_NODELAY
+
+#endif /* ACE_CONFIG_POSIX_NONETWORKING_H */
diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h
index 9379c2ffc19..040ffa7c8eb 100644
--- a/ACE/ace/config-rtems.h
+++ b/ACE/ace/config-rtems.h
@@ -88,6 +88,7 @@
 #define ACE_HAS_MEMCHR
 #define ACE_HAS_MSG
 #define ACE_HAS_MT_SAFE_MKTIME
+#define ACE_HAS_NONCONST_READV
 #define ACE_HAS_POSIX_SEM
 #define ACE_HAS_POSIX_TIME
 #define ACE_HAS_REENTRANT_FUNCTIONS
@@ -114,7 +115,6 @@
 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK
 #define ACE_LACKS_READDIR_R
 #define ACE_LACKS_READLINK
-#define ACE_HAS_NONCONST_READV
 #define ACE_LACKS_READV
 #define ACE_LACKS_RLIMIT
 #define ACE_LACKS_RLIMIT_PROTOTYPE
@@ -141,73 +141,13 @@
 #define ACE_LACKS_FDOPEN
 #define ACE_HAS_TERMIOS
 
-#if defined (ACE_LACKS_NETWORKING)
-
-// Missing header files
-# define ACE_LACKS_SYS_UIO_H
-# define ACE_LACKS_SYS_SOCKET_H
-# define ACE_LACKS_NETINET_IN_H
-# define ACE_LACKS_NETDB_H
-# define ACE_LACKS_ARPA_INET_H
-# define ACE_LACKS_SYS_SELECT_H
-# define ACE_LACKS_NET_IF_H
-# define ACE_LACKS_SYSLOG_H
-# define ACE_LACKS_SYS_UN_H
-# define ACE_LACKS_MEMORY_H
-# define ACE_LACKS_SYS_SYSCTL_H
-# define ACE_LACKS_NETINET_TCP_H
-
-// Missing types
-# define ACE_LACKS_IOVEC
-# define ACE_LACKS_IN_ADDR
-# define ACE_LACKS_SOCKADDR_IN
-# define ACE_LACKS_HOSTENT
-# define ACE_LACKS_SOCKADDR
-# define ACE_LACKS_IP_MREQ
-# define ACE_LACKS_PROTOENT
-# define ACE_LACKS_SERVENT
-# define ACE_LACKS_IFREQ
-
-// Missing methods
-# define ACE_LACKS_GETHOSTBYADDR
-# define ACE_LACKS_GETHOSTBYNAME
-# define ACE_LACKS_GETIPNODEBYADDR
-# define ACE_LACKS_LISTEN
-# define ACE_LACKS_BIND
-# define ACE_LACKS_NTOHL
-# define ACE_LACKS_HTONL
-# define ACE_LACKS_HTONS
-# define ACE_LACKS_NTOHS
-# define ACE_LACKS_SELECT
-# define ACE_LACKS_SOCKET
-# define ACE_LACKS_SHUTDOWN
-# define ACE_LACKS_SETSOCKOPT
-# define ACE_LACKS_INET_ATON
-# define ACE_LACKS_INET_ADDR
-# define ACE_LACKS_INET_NTOA
-# define ACE_LACKS_GET_BCAST_ADDR
-# define ACE_LACKS_GETSERVBYNAME
-# define ACE_LACKS_ACCEPT
-# define ACE_LACKS_CONNECT
-# define ACE_LACKS_GETPEERNAME
-# define ACE_LACKS_GETSOCKNAME
-# define ACE_LACKS_GETSOCKOPT
-# define ACE_LACKS_RECV
-# define ACE_LACKS_SEND
-# define ACE_LACKS_SENDTO
-# define ACE_LACKS_RECVFROM
-# define ACE_LACKS_RECVMSG
-# define ACE_LACKS_SENDMSG
-# define ACE_LACKS_GETHOSTBYADDR_R
-# define ACE_LACKS_GETPROTOBYNAME
-# define ACE_LACKS_GETPROTOBYNUMBER
-# define ACE_LACKS_GETSERVBYNAME
-# undef ACE_HAS_MSG
-
-// Missing OS features
-# define ACE_LACKS_UNIX_SYSLOG
-# define ACE_LACKS_TCP_NODELAY
+// rtems 4.7 or higher
+#if (__RTEMS_MAJOR__ > 4) || (__RTEMS_MAJOR__ == 4 && __RTEMS_MINOR__ > 6)
+# define ACE_HAS_UALARM
+#endif
 
+#if defined (ACE_LACKS_NETWORKING)
+# include "ace/config-posix-nonetworking.h"
 #endif
 
 #endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-unixware-7.1.0.udk.h b/ACE/ace/config-unixware-7.1.0.udk.h
index 549db4416dd..33f4205fb04 100644
--- a/ACE/ace/config-unixware-7.1.0.udk.h
+++ b/ACE/ace/config-unixware-7.1.0.udk.h
@@ -199,24 +199,9 @@
 /* Platform supports POSIX Threads */
 #define ACE_HAS_PTHREADS
 
-/* Platform supports POSIX Threads .4a Draft 4 */
-/* #undef ACE_HAS_PTHREADS_DRAFT4 */
-
-/* Platform supports POSIX Threads .4a Draft 6 */
-/* #undef ACE_HAS_PTHREADS_DRAFT6 */
-
-/* Platform supports POSIX Threads .1c Draft 7 */
-/* #undef ACE_HAS_PTHREADS_DRAFT7 */
-
 /* Platform supports POSIX.1c-1995 threads */
 #define ACE_HAS_PTHREADS_STD
 
-/* Platform has pthread_condattr_setkind_np(). */
-/* #undef ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP */
-
-/* Platform has pthread_mutexattr_setkind_np(). */
-/* #undef ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP */
-
 /* pthread.h declares an enum with PTHREAD_PROCESS_PRIVATE and
    PTHREAD_PROCESS_SHARED values */
 #define ACE_HAS_PTHREAD_PROCESS_ENUM
@@ -409,9 +394,6 @@
 /* Platform needs to #include <sched.h> to get thread scheduling defs. */
 #define ACE_NEEDS_SCHED_H 1
 
-/* Turns off the LM_DEBUG and LM_ERROR logging macros... */
-/* #undef ACE_NLOGGING */
-
 /* The OS/platform supports the poll() event demultiplexor */
 #define ACE_USE_POLL 1