From 487de8e0eb62e6ea2fe318203df05dc0d4e4d566 Mon Sep 17 00:00:00 2001
From: megacz <megacz@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 28 Feb 2002 01:03:37 +0000
Subject: 2002-02-27  Adam Megacz <adam@xwt.org>

        * java/net/natInetAddress.cc: Changed USE_WINSOCK to WIN32, added
        '#undef STRICT'.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50120 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/java/net/natInetAddress.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'libjava/java/net')

diff --git a/libjava/java/net/natInetAddress.cc b/libjava/java/net/natInetAddress.cc
index cd281fc5b3e..15e5db732a2 100644
--- a/libjava/java/net/natInetAddress.cc
+++ b/libjava/java/net/natInetAddress.cc
@@ -10,16 +10,17 @@ details.  */
 
 #include <config.h>
 
-#ifdef USE_WINSOCK
+#ifdef WIN32
 
 #include <windows.h>
 #include <winsock.h>
+#undef STRICT
 
 #ifndef MAXHOSTNAMELEN
 #define MAXHOSTNAMELEN	64
 #endif /* MAXHOSTNAMELEN */
 
-#else
+#else /* WIN32 */
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -42,7 +43,7 @@ details.  */
 #include <netdb.h>
 #endif
 
-#endif /* USE_WINSOCK */
+#endif /* WIN32 */
 
 #include <gcj/cni.h>
 #include <jvm.h>
-- 
cgit v1.2.3