Removed HPUX support

8 files changed, 10 insertions, 33 deletions

diff --git a/ACE/tests/Cached_Accept_Conn_Test.cpp b/ACE/tests/Cached_Accept_Conn_Test.cpp
index 960816e3402..5338c38ddc0 100644
--- a/ACE/tests/Cached_Accept_Conn_Test.cpp
+++ b/ACE/tests/Cached_Accept_Conn_Test.cpp
@@ -34,8 +34,6 @@
 // happy, it was necessary to have the definitions of the methods of
 // the Accept_Strategy before the instantiations.
 
-// HPUX doesn't accept these declaration after their usage.
-
 // For some strange reason this must *not* be static since otherwise
 // certain versions of SunC++ will not link properly.
 int connection_accepted = 0;
diff --git a/ACE/tests/FIFO_Test.cpp b/ACE/tests/FIFO_Test.cpp
index c5f665a4fdc..f7aa9eb2ca7 100644
--- a/ACE/tests/FIFO_Test.cpp
+++ b/ACE/tests/FIFO_Test.cpp
@@ -106,9 +106,9 @@ server (void *arg)
 
   // On AIX, select() always seems to select a fifo handle as a normal file,
   // always readable. Just wait a second...
-# if defined (AIX) || defined (HPUX) || defined (__osf__)
+# if defined (AIX) defined (__osf__)
   ACE_OS::sleep (1);
-# endif /* AIX || HPUX */
+# endif /* AIX */
 
   // Read the things the client is sending; alphabet, huge overflow, then
   // alphabet.
diff --git a/ACE/tests/Logging_Strategy_Test.cpp b/ACE/tests/Logging_Strategy_Test.cpp
index 273dbcadf48..c3d61cadabb 100644
--- a/ACE/tests/Logging_Strategy_Test.cpp
+++ b/ACE/tests/Logging_Strategy_Test.cpp
@@ -36,8 +36,7 @@
 #include "ace/Thread_Manager.h"
 
 #if defined (ACE_AS_STATIC_LIBS) || \
-  (!defined (ACE_WIN32) && !defined (ACE_HAS_SVR4_DYNAMIC_LINKING) && \
-   !defined (__hpux))
+  (!defined (ACE_WIN32) && !defined (ACE_HAS_SVR4_DYNAMIC_LINKING))
 #include "ace/Logging_Strategy.h"
 #endif
 
@@ -430,9 +429,7 @@ int run_main (int argc, ACE_TCHAR *argv [])
   // though, and you may activate the logging strategy as described in
   // the non-DLL section below under DLL environments as well.
 
-#if !defined (ACE_AS_STATIC_LIBS) && \
-  (defined (ACE_WIN32) || defined (ACE_HAS_SVR4_DYNAMIC_LINKING) || \
-   defined (__hpux))
+#if !defined (ACE_AS_STATIC_LIBS) && (defined (ACE_WIN32) || defined (ACE_HAS_SVR4_DYNAMIC_LINKING))
 
   // Platform support DLLs, and not configured to link statically
   ACE_TCHAR arg_str[250];
@@ -467,8 +464,7 @@ int run_main (int argc, ACE_TCHAR *argv [])
        ((LM_ERROR,
          "Error initializing the ACE_Logging_Strategy.\n"),
                        1);
-#endif /* !ACE_AS_STATIC_LIBS && (ACE_WIN32 ||
-          ACE_HAS_SVR4_DYNAMIC_LINKING || __hpux) */
+#endif /* !ACE_AS_STATIC_LIBS && (ACE_WIN32 ACE_HAS_SVR4_DYNAMIC_LINKING) */
 
   // launch a new Thread
   if (ACE_Thread_Manager::instance ()->spawn
diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp
index bbbf4c6a61d..c93ea9b304e 100644
--- a/ACE/tests/Malloc_Test.cpp
+++ b/ACE/tests/Malloc_Test.cpp
@@ -70,7 +70,7 @@ static const void *PARENT_BASE_ADDR = ACE_DEFAULT_BASE_ADDR;
 // processes.  So, though the whole PI pointer thing is tested here,
 // it isn't actually using multiple address ranges.
 
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 && !defined (HPUX))
+#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 # define CHILD_ADDR_DELTA (1024*1024)
 #else
 # define CHILD_ADDR_DELTA 0
diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp
index e48b46a43de..b9fad773749 100644
--- a/ACE/tests/OS_Test.cpp
+++ b/ACE/tests/OS_Test.cpp
@@ -603,8 +603,6 @@ snprintf_test (SNPrintF_t fn)
   ACE_OS::memset(buf, 0xab, 2*BUFFER_SIZE);
   retval = fn (buf, BUFFER_SIZE, "%d", 1234);
 
-  // HP-UX has broken vsnprintf
-#if !defined (HPUX)
   if (retval != 4)
     {
       ACE_ERROR ((LM_ERROR,
@@ -612,7 +610,6 @@ snprintf_test (SNPrintF_t fn)
                   retval));
       ++error_count;
     }
-#endif /* !HPUX */
 
   if (buf[3] != 0)
     {
diff --git a/ACE/tests/Process_Strategy_Test.cpp b/ACE/tests/Process_Strategy_Test.cpp
index 8b29d634394..d8df9490bac 100644
--- a/ACE/tests/Process_Strategy_Test.cpp
+++ b/ACE/tests/Process_Strategy_Test.cpp
@@ -48,11 +48,6 @@
 // Counting_Service and Options in here
 #include "Process_Strategy_Test.h"
 
-// This test does not function properly when fork() is used on HP-UX
-#if defined(__hpux)
-#define ACE_LACKS_FORK
-#endif /* __hpux */
-
 ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Options, ACE_Null_Mutex);
 
 // Define a <Strategy_Acceptor> that's parameterized by the
@@ -361,13 +356,6 @@ Counting_Service::handle_input (ACE_HANDLE)
 {
   char buf[BUFSIZ];
   ACE_Time_Value* timeout = 0;
-#if defined (__hpux)
-  // Even though we're in handle_input, there seems to be a
-  // situation on HP-UX where there is nothing to recv just yet.
-  // So, we recv() with a timeout and everything works.
-  ACE_Time_Value hpux_timeout (3);
-  timeout = &hpux_timeout;
-#endif /* __hpux */
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) reading from peer on %d\n"),
diff --git a/ACE/tests/Unload_libACE.cpp b/ACE/tests/Unload_libACE.cpp
index ed0e775b8ac..42270fa0b6d 100644
--- a/ACE/tests/Unload_libACE.cpp
+++ b/ACE/tests/Unload_libACE.cpp
@@ -26,9 +26,9 @@
 #endif /* !ACE_VXWORKS && !__MINGW32__ && !CYGWIN32 */
 #endif /* __GNUC__ */
 
-#if defined (__hpux) || defined (__SUNPRO_CC)
+#if defined (__SUNPRO_CC)
 #define UNLOAD_LIBACE_TEST 1
-#endif /* (__hpux) || (__SUNPRO_CC) */
+#endif /* (__SUNPRO_CC) */
 
 #if defined (ACE_AS_STATIC_LIBS)
 #undef UNLOAD_LIBACE_TEST
@@ -160,9 +160,7 @@ main (int, char **)
 #else
           strcat (buf, "ACE");
 #endif /* ACE_LIB_NAME */
-#if defined (__hpux) && !(defined (__ia64) && (__ia64 == 1))
-          strcat (buf, ".sl");
-#elif defined (__APPLE__)
+#if defined (__APPLE__)
           strcat (buf, ".dylib");
 #else
           strcat (buf, ".so");
diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst
index 9434fe85608..c8b018e3eb6 100644
--- a/ACE/tests/run_test.lst
+++ b/ACE/tests/run_test.lst
@@ -194,7 +194,7 @@ Proactor_UDP_Test: !VxWorks !LynxOS !nsk !ACE_FOR_TAO !BAD_AIO
 Process_Env_Test: !VxWorks !PHARLAP
 Process_Test: !VxWorks !ACE_FOR_TAO !PHARLAP
 Process_Manager_Test: !VxWorks !ACE_FOR_TAO !PHARLAP
-Process_Manual_Event_Test: !HPUX !VxWorks !ACE_FOR_TAO !PHARLAP
+Process_Manual_Event_Test: !VxWorks !ACE_FOR_TAO !PHARLAP
 Process_Mutex_Test: !VxWorks !ACE_FOR_TAO !PHARLAP
 Process_Semaphore_Test: !VxWorks !ACE_FOR_TAO !PHARLAP
 RB_Tree_Test