1 files changed, 7 insertions, 13 deletions

diff --git a/tests/SPIPE_Test.cpp b/tests/SPIPE_Test.cpp
index 401d548dbfb..70d868a1f99 100644
--- a/tests/SPIPE_Test.cpp
+++ b/tests/SPIPE_Test.cpp
@@ -31,13 +31,7 @@
 
 ACE_RCSID(tests, SPIPE_Test, "$Id$")
 
-#if defined (ACE_HAS_STREAM_PIPES) \
-    || (defined (ACE_WIN32) && defined(ACE_HAS_WINNT4) \
-        && (ACE_HAS_WINNT4 !=0))
-# define TEST_HAS_STREAM_PIPES
-#endif
-
-#if defined (TEST_HAS_STREAM_PIPES)
+#if defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32)
 
 static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz";
 
@@ -54,7 +48,7 @@ client (void *)
   ACE_OS::sleep (10);
 
   if (con.connect (cli_stream, ACE_SPIPE_Addr (rendezvous)) == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n%a"), rendezvous, 1));
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), rendezvous));
 
   for (const char *c = ACE_ALPHABET; *c != '\0'; c++)
     if (cli_stream.send (c, 1) == -1)
@@ -82,13 +76,13 @@ server (void *)
   // Initialize named pipe listener.
 
   if (acceptor.open (ACE_SPIPE_Addr (rendezvous)) == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n%a"), ACE_TEXT ("open"), 1));
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("waiting for connection\n")));
 
   // Accept a client connection
   if (acceptor.accept (new_stream, 0) == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n%a"), ACE_TEXT ("accept"), 1));
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("accept")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Accepted connection\n")));
 
@@ -102,14 +96,14 @@ server (void *)
   acceptor.close ();
   return 0;
 }
-#endif /* TEST_HAS_STREAM_PIPES */
+#endif /* ACE_HAS_STREAM_PIPES || ACE_WIN32 */
 
 int
 main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("SPIPE_Test"));
 
-#if defined (TEST_HAS_STREAM_PIPES)
+#if defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32)
 #if !defined (ACE_LACKS_FORK)
   switch (ACE_OS::fork ())
     {
@@ -137,7 +131,7 @@ main (int, ACE_TCHAR *[])
 #else
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("SPIPE is not supported on this platform\n")));
-#endif /* TEST_HAS_STREAM_PIPES */
+#endif /* ACE_HAS_STREAM_PIPES || ACE_WIN32 */
   ACE_END_TEST;
   return 0;
 }