Merge pull request #1435 from jwillemsen/jwi-lynxos4cleanup

Cleanup LynxOS4 support, fixes #1434

10 files changed, 13 insertions, 116 deletions

diff --git a/ACE/ace/OS_NS_pwd.inl b/ACE/ace/OS_NS_pwd.inl
index ed75cfdc961..3353f649469 100644
--- a/ACE/ace/OS_NS_pwd.inl
+++ b/ACE/ace/OS_NS_pwd.inl
@@ -48,14 +48,6 @@ ACE_OS::getpwnam_r (const char *name,
   ACE_UNUSED_ARG (bufsize);
   ACE_UNUSED_ARG (result);
   ACE_NOTSUP_RETURN (0);
-#elif defined (ACE_HAS_LYNXOS4_GETPWNAM_R)
-  if (::getpwnam_r (pwd, const_cast<char*>(name), buffer, bufsize) == -1)
-    {
-      *result = 0;
-      return -1;
-    }
-  *result = pwd;
-  return 0;
 #elif defined (ACE_HAS_STHREADS)
   if (::getpwnam_r (name, pwd, buffer, bufsize) != 0)
     {
diff --git a/ACE/ace/OS_NS_signal.inl b/ACE/ace/OS_NS_signal.inl
index e125f430c1c..b9b3616d84f 100644
--- a/ACE/ace/OS_NS_signal.inl
+++ b/ACE/ace/OS_NS_signal.inl
@@ -201,11 +201,11 @@ signal (int signum, ACE_SignalHandler func)
   else
 #if (defined ACE_WIN32 && !defined ACE_HAS_WINCE) || \
     (!defined ACE_LACKS_UNIX_SIGNALS && !defined ACE_LACKS_SIGNAL)
-#  if !defined (ACE_HAS_TANDEM_SIGNALS) && !defined (ACE_HAS_LYNXOS4_SIGNALS)
+#  if !defined (ACE_HAS_TANDEM_SIGNALS)
     return ::signal (signum, func);
 #  else
     return (ACE_SignalHandler) ::signal (signum, (void (*)(int)) func);
-#  endif /* !ACE_HAS_TANDEM_SIGNALS && !ACE_HAS_LYNXOS4_SIGNALS */
+#  endif /* !ACE_HAS_TANDEM_SIGNALS */
 #else
     // @@ WINCE: Don't know how to implement signal on WinCE (yet.)
     ACE_UNUSED_ARG (signum);
diff --git a/ACE/ace/README b/ACE/ace/README
index 7571ccbfef3..9da9b715268 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -792,8 +792,6 @@ ACE_LACKS_FLOATING_POINT                Platform does not support
 ACE_LACKS_FORK                          Platform lacks the fork()
                                         system call (e.g., Win32,
                                         VxWorks, Chorus)
-ACE_LACKS_GETOPT_PROTOTYPE              Platform lacks the getopt()
-                                        prototype (e.g., LynxOS)
 ACE_LACKS_GETPGID                       Platform lacks getpgid() call
                                         (e.g., Win32, Chorus, and
                                         FreeBSD).
@@ -804,9 +802,6 @@ ACE_LACKS_GETIPNODEBYADDR               Platform lacks getipnodebyaddr().
 ACE_LACKS_GETIPNODEBYNAME               Platform lacks getipnodebyname().
 ACE_LACKS_INET_ATON                     Platform lacks the inet_aton()
                                         function.
-ACE_LACKS_INET_ATON_PROTOTYPE           Platform/compiler lacks the
-                                        inet_aton() prototype (e.g.,
-                                        LynxOS)
 ACE_LACKS_IOSTREAM_FX                   iostream header does not
                                         declare ipfx (), opfx (),
                                         etc.
@@ -826,13 +821,7 @@ ACE_LACKS_MEMORY_H                      Platform lacks memory.h (e.g.,
 ACE_LACKS_MKFIFO                        Platform lacks mkfifo() e.g.,
                                         VxWorks, Chorus, pSoS, and WinNT.
 ACE_LACKS_MKTEMP                        Platform lacks the mktemp() function.
-ACE_LACKS_MKTEMP_PROTOTYPE              Platform/compiler lacks the
-                                        mktemp() prototype (e.g.,
-                                        LynxOS)
 ACE_LACKS_MKSTEMP      Platform lacks the mkstemp() function.
-ACE_LACKS_MKSTEMP_PROTOTYPE             Platform/compiler lacks the
-                                        mkstemp() prototype (e.g.,
-                                        LynxOS)
 ACE_LACKS_MMAP                          The platform doesn't have
                                         mmap(2) (e.g., SCO UNIX).
 ACE_LACKS_MODE_MASKS                    Platform/compiler doesn't have
@@ -968,12 +957,6 @@ ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES  Compiler doesn't support
 ACE_LACKS_STRCASECMP                    Compiler/platform lacks
                                         strcasecmp() (e.g., DG/UX,
                                         UNIXWARE, VXWORKS)
-ACE_LACKS_STRCASECMP_PROTOTYPE          Platform/compiler lacks the
-                                        strcasecmp() prototype (e.g.,
-                                        LynxOS)
-ACE_LACKS_STRNCASECMP_PROTOTYPE         Platform/compiler lacks the
-                                        strncasecmp() prototype (e.g.,
-                                        LynxOS)
 ACE_LACKS_STRRECVFD                     Platform doesn't define struct
                                         strrecvfd.
 ACE_LACKS_SYSCALL                       Platform doesn't have
diff --git a/ACE/ace/Sig_Handler.cpp b/ACE/ace/Sig_Handler.cpp
index e87fb94f60d..9b6e4a8e272 100644
--- a/ACE/ace/Sig_Handler.cpp
+++ b/ACE/ace/Sig_Handler.cpp
@@ -157,9 +157,7 @@ ACE_Sig_Handler::register_handler_i (int signum,
         new_disp = &sa;
 
       new_disp->handler (ace_signal_handler_dispatcher);
-#if !defined (ACE_HAS_LYNXOS4_SIGNALS)
       new_disp->flags (new_disp->flags () | SA_SIGINFO);
-#endif /* ACE_HAS_LYNXOS4_SIGNALS */
       return new_disp->register_action (signum, old_disp);
     }
   else
@@ -430,9 +428,7 @@ ACE_Sig_Handlers::register_handler (int signum,
 
           // Default is to restart signal handlers.
           new_disp->flags (new_disp->flags () | SA_RESTART);
-#if !defined (ACE_HAS_LYNXOS4_SIGNALS)
           new_disp->flags (new_disp->flags () | SA_SIGINFO);
-#endif /* ACE_HAS_LYNXOS4_SIGNALS */
 
           // Finally install (possibly reinstall) the ACE signal
           // handler disposition with the SA_RESTART mode enabled.
diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h
index dde1fd71cd4..e2f6a3f93c6 100644
--- a/ACE/ace/config-lynxos.h
+++ b/ACE/ace/config-lynxos.h
@@ -121,63 +121,17 @@
 #  define ACE_HAS_BROKEN_THREAD_KEYFREE
 #endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */
 
-#if ACE_LYNXOS_MAJOR == 4 && ACE_LYNXOS_MINOR == 0
-// LynxOS 4.0
-#  define ACE_LACKS_GETOPT_PROTOTYPE
-#  define ACE_LACKS_INET_ATON_PROTOTYPE
-#  define ACE_LACKS_PTHREAD_ATTR_SETSTACKADDR
-#  define ACE_LACKS_REGEX_H
-#  define ACE_LACKS_RWLOCK_T
-#  define ACE_LACKS_SETDETACH
-#  define ACE_LACKS_STRCASECMP_PROTOTYPE
-#  define ACE_LACKS_STRNCASECMP_PROTOTYPE
-#  define ACE_LACKS_SYS_SELECT_H
-#  define ACE_LACKS_THREAD_PROCESS_SCOPING
-#endif
-
-#if (ACE_LYNXOS_MAJOR > 4) || (ACE_LYNXOS_MAJOR == 4 && ACE_LYNXOS_MINOR >= 2)
-// LynxOS 4.2 and 5.0
-#  define ACE_HAS_POSIX_SEM_TIMEOUT
-#  define ACE_HAS_MUTEX_TIMEOUTS
-#endif
-
-#if (ACE_LYNXOS_MAJOR < 5)
-// LynxOS 4.x
-#  define ACE_HAS_LYNXOS4_GETPWNAM_R
-#  define ACE_HAS_LYNXOS4_SIGNALS
-#  define ACE_HAS_SEMUN
-#  define ACE_HAS_STRBUF_T
-#  define ACE_HAS_SYSV_IPC
-#  define ACE_LACKS_CONST_TIMESPEC_PTR
-#  define ACE_LACKS_GETPGID
-#  define ACE_LACKS_ISBLANK
-#  define ACE_LACKS_MKSTEMP_PROTOTYPE
-#  define ACE_LACKS_MKTEMP_PROTOTYPE
-#  define ACE_LACKS_PTHREAD_ATTR_SETSTACK
-#  define ACE_LACKS_PUTENV_PROTOTYPE
-#  define ACE_LACKS_SETEGID
-#  define ACE_LACKS_SETENV
-#  define ACE_LACKS_SETEUID
-#  define ACE_LACKS_SWAB_PROTOTYPE
-#  define ACE_LACKS_UNSETENV
-#  define ACE_LACKS_USECONDS_T
-#  define ACE_LACKS_VSNPRINTF
-#  define ACE_LACKS_WCHAR_H
-#  define ACE_SYS_SIGLIST sys_siglist
-#  if !defined (ACE_HAS_THREADS)
-#    undef ACE_HAS_AIO_CALLS
-#  endif
-#else
 // LynxOS 5.0
-#  define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-#  define ACE_HAS_NONCONST_INET_ADDR
-#  define ACE_LACKS_INET_ATON_PROTOTYPE
-#  define ACE_LACKS_SEMBUF_T
-#  define ACE_LACKS_STROPTS_H
-#  define ACE_LACKS_STRRECVFD
-#  define ACE_LACKS_SYS_SEM_H
-#  define ACE_SYS_SIGLIST __sys_siglist
-#endif
+#define ACE_HAS_POSIX_SEM_TIMEOUT
+#define ACE_HAS_MUTEX_TIMEOUTS
+#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
+#define ACE_HAS_NONCONST_INET_ADDR
+#define ACE_LACKS_INET_ATON_PROTOTYPE
+#define ACE_LACKS_SEMBUF_T
+#define ACE_LACKS_STROPTS_H
+#define ACE_LACKS_STRRECVFD
+#define ACE_LACKS_SYS_SEM_H
+#define ACE_SYS_SIGLIST __sys_siglist
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/os_include/os_signal.h b/ACE/ace/os_include/os_signal.h
index f9d3d1f38c1..9b5de3b8ce1 100644
--- a/ACE/ace/os_include/os_signal.h
+++ b/ACE/ace/os_include/os_signal.h
@@ -153,7 +153,7 @@ extern "C"
   // Prototypes for both signal() and struct sigaction are consistent..
   typedef void (*ACE_SignalHandler)(int);
   typedef void (*ACE_SignalHandlerV)(int);
-#elif defined (ACE_HAS_LYNXOS4_SIGNALS) || defined (ACE_HAS_TANDEM_SIGNALS)
+#elif defined (ACE_HAS_TANDEM_SIGNALS)
    typedef void (*ACE_SignalHandler)(...);
    typedef void (*ACE_SignalHandlerV)(...);
 #elif defined (ACE_HAS_SVR4_SIGNAL_T)
diff --git a/ACE/ace/os_include/os_stdlib.h b/ACE/ace/os_include/os_stdlib.h
index 5f0ca9b0da9..e3a5d6d3dbe 100644
--- a/ACE/ace/os_include/os_stdlib.h
+++ b/ACE/ace/os_include/os_stdlib.h
@@ -48,14 +48,6 @@ extern "C"
   int putenv (char *);
 #endif /* ACE_LACKS_PUTENV_PROTOTYPE */
 
-#if defined (ACE_LACKS_MKTEMP_PROTOTYPE)
-  char *mktemp (char *);
-#endif /* ACE_LACKS_MKTEMP_PROTOTYPE */
-
-#if defined (ACE_LACKS_MKSTEMP_PROTOTYPE)
-  int mkstemp (char *);
-#endif /* ACE_LACKS_MKSTEMP_PROTOTYPE */
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ACE/ace/os_include/os_strings.h b/ACE/ace/os_include/os_strings.h
index 3120adab207..e056af75b01 100644
--- a/ACE/ace/os_include/os_strings.h
+++ b/ACE/ace/os_include/os_strings.h
@@ -34,14 +34,6 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-#if defined (ACE_LACKS_STRCASECMP_PROTOTYPE)
-  int strcasecmp(const char *, const char *);
-#endif /* ACE_LACKS_STRCASECMP_PROTOTYPE */
-
-#if defined (ACE_LACKS_STRNCASECMP_PROTOTYPE)
-  int strncasecmp(const char *, const char *, size_t);
-#endif /* ACE_LACKS_STRNCASECMP_PROTOTYPE */
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ACE/ace/os_include/os_unistd.h b/ACE/ace/os_include/os_unistd.h
index 55235d30398..db6275d0026 100644
--- a/ACE/ace/os_include/os_unistd.h
+++ b/ACE/ace/os_include/os_unistd.h
@@ -175,14 +175,6 @@ extern "C"
 
 # endif /* ACE_LACKS_TIMEDWAIT_PROTOTYPES */
 
-#if defined (ACE_LACKS_SWAB_PROTOTYPE)
-  void swab(const void *, void *, ssize_t);
-#endif /* ACE_LACKS_SWAB_PROTOTYPE */
-
-#if defined (ACE_LACKS_GETOPT_PROTOTYPE)
-  int getopt(int, char * const [], const char *);
-#endif /* ACE_LACKS_GETOPT_PROTOTYPE */
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ACE/tests/Task_Ex_Test.cpp b/ACE/tests/Task_Ex_Test.cpp
index b15d5bb57a6..4acc9159ea6 100644
--- a/ACE/tests/Task_Ex_Test.cpp
+++ b/ACE/tests/Task_Ex_Test.cpp
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file    Task_Ex_Test.cpp
@@ -10,15 +9,12 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "Task_Ex_Test.h"
 #include "ace/Task_Ex_T.h"
 #include "ace/Log_Msg.h"
 #include "ace/Auto_Ptr.h"
 
-
-
 #if defined (ACE_HAS_THREADS)
 
 /// default params