natInetAddress.cc: Changed USE_WINSOCK to WIN32, added '#undef STRICT'.

2002-02-27  Adam Megacz <adam@xwt.org>

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

From-SVN: r50120

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index cf3a89eb3b3376d95a3e1aff7406bc0c529871a0..004c39c3df7eeb907414b3156cd836e26903d27e 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-27  Adam Megacz <adam@xwt.org>
+
+       * java/net/natInetAddress.cc: Changed USE_WINSOCK to WIN32, added
+       '#undef STRICT'.
+
 2002-02-26  Tom Tromey  <tromey@redhat.com>
 
        * java/lang/natSystem.cc (init_properties): Use __VERSION__.

diff --git a/libjava/java/net/natInetAddress.cc b/libjava/java/net/natInetAddress.cc
index cd281fc5b3ea4638964109b80a18ec8b228a3d23..15e5db732a2b68b8164c78a5a562e33592c408e3 100644 (file)
--- 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>