1 files changed, 6 insertions, 9 deletions
diff --git a/tests/UPIPE_SAP_Test.cpp b/tests/UPIPE_SAP_Test.cpp
index 04fcd624c91..f7135d3c44e 100644
--- a/tests/UPIPE_SAP_Test.cpp
+++ b/tests/UPIPE_SAP_Test.cpp
@@ -29,9 +29,7 @@ USELIB("..\ace\aced.lib");
 //---------------------------------------------------------------------------
 #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
 
-#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || \
-        (defined (ACE_WIN32) && \
-         defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)))
+#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32))
 
 // Global pattern
 static ACE_UPIPE_Addr addr (ACE_TEXT ("pattern"));
@@ -140,17 +138,14 @@ acceptor (void *args)
   ACE_DEBUG ((LM_DEBUG, "(%t) exiting thread\n"));
   return 0;
 }
-#endif /* ACE_HAS_THREADS && defined ACE_HAS_STREAM_PIPES || (ACE_WIN32&&NT4)*/
+#endif /* ACE_HAS_THREADS && defined ACE_HAS_STREAM_PIPES || ACE_WIN32 */
 
 int
 main (int, char *[])
 {
   ACE_START_TEST ("UPIPE_SAP_Test");
 
-#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || \
-        (defined (ACE_WIN32) && \
-         defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)))
-
+#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32))
   ACE_UPIPE_Acceptor acc (addr);
 
   // Spawn a acceptor thread.
@@ -178,9 +173,11 @@ main (int, char *[])
 #if !defined (ACE_HAS_THREADS)
   ACE_ERROR ((LM_INFO, "threads not supported on this platform\n"));
 #else
+#if !defined (ACE_HAS_STREAM_PIPES) && !defined (ACE_WIN32)
   ACE_ERROR ((LM_INFO, "UPIPE is not supported on this platform\n"));
+#endif /* !defined (ACE_HAS_STREAM_PIPES) && ! defined (ACE_WIN32) */
 #endif /* !defined (ACE_HAS_THREADS) */
-#endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32) && NT4) */
+#endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32)) */
 
   ACE_END_TEST;
   return 0;