merged the two VxWorks configs into config-vxworks5.x.h, and added ACE_THR_PRI_FIFO_DEF

2 files changed, 43 insertions, 114 deletions

diff --git a/ace/config-vxworks-ghs-1.8.h b/ace/config-vxworks-ghs-1.8.h
deleted file mode 100644
index ad70ad344bd..00000000000
--- a/ace/config-vxworks-ghs-1.8.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for VxWorks
-// 5.2/5.3 platforms using the GreenHills 1.8.8 (not 1.8.7!!!!) compiler.
-
-#if !defined (ACE_CONFIG_H)
-#define ACE_CONFIG_H
-
-// Processor type, if necessary.  GreenHills defines "ppc".
-#if defined (ppc)
-# define ACE_HAS_POWERPC
-#endif /* ppc */
-
-#if ! defined (__ACE_INLINE__)
-# define __ACE_INLINE__
-#endif /* ! __ACE_INLINE__ */
-
-#define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 32768
-#define ACE_DEFAULT_THREAD_KEYS 16
-#define ACE_HAS_BROKEN_SENDMSG
-#define ACE_HAS_BROKEN_WRITEV
-#define ACE_HAS_CHARPTR_SOCKOPT
-#define ACE_HAS_CLOCK_GETTIME
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-#define ACE_HAS_CPLUSPLUS_HEADERS
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-#define ACE_HAS_MSG
-#define ACE_HAS_MT_SAFE_SOCKETS
-#define ACE_HAS_NONSTATIC_OBJECT_MANAGER
-#define ACE_HAS_POSIX_NONBLOCK
-#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_SIGINFO_T
-#define ACE_HAS_SIGWAIT
-#define ACE_HAS_SIG_ATOMIC_T
-#define ACE_HAS_STRERROR
-#define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
-#define ACE_HAS_THREADS
-#define ACE_HAS_TSS_EMULATION
-#define ACE_HAS_WCHAR_TYPEDEFS_CHAR
-#define ACE_LACKS_ACCESS
-#define ACE_LACKS_COND_T
-#define ACE_LACKS_EXEC
-#define ACE_LACKS_FCNTL
-#define ACE_LACKS_FILELOCKS
-#define ACE_LACKS_FORK
-#define ACE_LACKS_GETSERVBYNAME
-#define ACE_LACKS_KEY_T
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
-#define ACE_LACKS_LONGLONG_T
-#define ACE_LACKS_MADVISE
-#define ACE_LACKS_MALLOC_H
-#define ACE_LACKS_MEMORY_H
-#define ACE_LACKS_MKTEMP
-#define ACE_LACKS_MMAP
-#define ACE_LACKS_MPROTECT
-#define ACE_LACKS_MSYNC
-#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
-#define ACE_LACKS_PARAM_H
-#define ACE_LACKS_PWD_FUNCTIONS
-#define ACE_LACKS_RLIMIT
-#define ACE_LACKS_RWLOCK_T
-#define ACE_LACKS_SBRK
-#define ACE_LACKS_SEMBUF_T
-#define ACE_LACKS_SIGINFO_H
-#define ACE_LACKS_SIGNED_CHAR
-#define ACE_LACKS_SI_ADDR
-#define ACE_LACKS_SOCKETPAIR
-#define ACE_LACKS_STRCASECMP
-#define ACE_LACKS_STRRECVFD
-#define ACE_LACKS_SYSCALL
-#define ACE_LACKS_SYSV_MSG_H
-#define ACE_LACKS_SYSV_SHMEM
-#define ACE_LACKS_SYS_NERR
-#define ACE_LACKS_TIMESPEC_T
-#define ACE_LACKS_UCONTEXT_H
-#define ACE_LACKS_UNISTD_H
-#define ACE_LACKS_UNIX_SIGNALS
-#define ACE_LACKS_UTSNAME_T
-#if !defined (ACE_MT_SAFE)
-# define ACE_MT_SAFE 1
-#endif
-#define ACE_NEEDS_SYSTIME_H
-#define ACE_PAGE_SIZE 4096
-
-#if !defined (ACE_NTRACE)
-# define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
-
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-vxworks5.x-g++.h b/ace/config-vxworks5.x.h
index e3b1fc38aa2..da7d4dc3622 100644
--- a/ace/config-vxworks5.x-g++.h
+++ b/ace/config-vxworks5.x.h
@@ -2,8 +2,9 @@
 // $Id$
 
 // The following configuration file is designed to work for VxWorks
-// 5.2/5.3 platforms using the GNU/Cygnus g++ 2.7.2 compiler, without
-// repo patch.
+// 5.2/5.3 platforms using one of these compilers:
+// 1) The GNU/Cygnus g++ compiler that is shipped with Tornado 1.0.1.
+// 2) The GreenHills 1.8.8 (not 1.8.7!!!!) compiler.
 
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
@@ -12,20 +13,46 @@
 # define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
 
-// Even though the documentation suggests that g++/VxWorks 5.3.1
-// (Tornado 1.0.1) supports long long, Wind River tech support says
-// that it doesn't.  It causes undefined symbols for math functions.
-#define ACE_LACKS_LONGLONG_T
+// Compiler-specific configuration.
 
-// On g++/VxWorks, iostream.h defines a static instance (yes, instance)
-// of the Iostream_init class.  That causes all files that #include it
-// to put in the global constructor/destructor hooks.  For files that
-// don't have any static instances of non-class (built-in) types, the
-// hooks refer to the file name, e.g., "foo.cpp".  That file name gets
-// embedded in a variable name by munch.  The output from munch won't
-// compile, though, because of the period!  So, let g++/VxWorks users
-// include iostream.h only where they need it.
-#define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION
+#if defined (__GNUG__)
+# define ACE_HAS_VERBOSE_NOTSUP
+# define ACE_LACKS_IOSTREAM_FX
+# define ACE_MAIN ace_main
+
+# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
+# define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
+# define ACE_TEMPLATES_REQUIRE_SOURCE
+
+  // Even though the documentation suggests that g++/VxWorks 5.3.1
+  // (Tornado 1.0.1) supports long long, Wind River tech support says
+  // that it doesn't.  It causes undefined symbols for math functions.
+# define ACE_LACKS_LONGLONG_T
+
+  // On g++/VxWorks, iostream.h defines a static instance (yes, instance)
+  // of the Iostream_init class.  That causes all files that #include it
+  // to put in the global constructor/destructor hooks.  For files that
+  // don't have any static instances of non-class (built-in) types, the
+  // hooks refer to the file name, e.g., "foo.cpp".  That file name gets
+  // embedded in a variable name by munch.  The output from munch won't
+  // compile, though, because of the period!  So, let g++/VxWorks users
+  // include iostream.h only where they need it.
+# define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION
+#elif defined (ghs)
+  // Processor type, if necessary.  GreenHills defines "ppc".
+# if defined (ppc)
+#   define ACE_HAS_POWERPC
+# endif /* ppc */
+
+# define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
+# define ACE_HAS_WCHAR_TYPEDEFS_CHAR
+# define ACE_LACKS_LONGLONG_T
+# define ACE_LACKS_UNISTD_H
+#else  /* ! __GNUG__ && ! ghs */
+# error unsupported compiler on VxWorks
+#endif /* ! __GNUG__ && ! ghs */
+
+// OS-specific configuration
 
 #define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 32768
 #define ACE_DEFAULT_THREAD_KEYS 16
@@ -47,7 +74,6 @@
 #define ACE_HAS_STRERROR
 #define ACE_HAS_THREADS
 #define ACE_HAS_TSS_EMULATION
-#define ACE_HAS_VERBOSE_NOTSUP
 #define ACE_LACKS_ACCESS
 #define ACE_LACKS_COND_T
 #define ACE_LACKS_EXEC
@@ -55,7 +81,6 @@
 #define ACE_LACKS_FILELOCKS
 #define ACE_LACKS_FORK
 #define ACE_LACKS_GETSERVBYNAME
-#define ACE_LACKS_IOSTREAM_FX
 #define ACE_LACKS_KEY_T
 #define ACE_LACKS_LINEBUFFERED_STREAMBUF
 #define ACE_LACKS_MADVISE
@@ -76,7 +101,6 @@
 #define ACE_LACKS_SIGNED_CHAR
 #define ACE_LACKS_SI_ADDR
 #define ACE_LACKS_SOCKETPAIR
-#define ACE_LACKS_SOCKET_BUFSIZ
 #define ACE_LACKS_STRCASECMP
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_SYSCALL
@@ -90,14 +114,9 @@
 #if !defined (ACE_MT_SAFE)
 # define ACE_MT_SAFE 1
 #endif
-#define ACE_MAIN ace_main
-// #define ACE_MALLOC_ALIGN 8
 #define ACE_NEEDS_SYSTIME_H
 #define ACE_PAGE_SIZE 4096
-
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-#define ACE_TEMPLATES_REQUIRE_SOURCE
+#define ACE_THR_PRI_FIFO_DEF 6
 
 #if !defined (ACE_NTRACE)
 # define ACE_NTRACE 1