summaryrefslogtreecommitdiffstats
path: root/libjava/java/net
diff options
context:
space:
mode:
authormegacz <megacz@138bc75d-0d04-0410-961f-82ee72b054a4>2002-02-28 01:03:37 +0000
committermegacz <megacz@138bc75d-0d04-0410-961f-82ee72b054a4>2002-02-28 01:03:37 +0000
commit487de8e0eb62e6ea2fe318203df05dc0d4e4d566 (patch)
tree56ea18523848cecc8aa90fd4a1186e1d4ef88299 /libjava/java/net
parent3496a6b8ac4897c673117b411479fc35b4e54377 (diff)
downloadppe42-gcc-487de8e0eb62e6ea2fe318203df05dc0d4e4d566.tar.gz
ppe42-gcc-487de8e0eb62e6ea2fe318203df05dc0d4e4d566.zip
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
Diffstat (limited to 'libjava/java/net')
-rw-r--r--libjava/java/net/natInetAddress.cc7
1 files changed, 4 insertions, 3 deletions
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>
OpenPOWER on IntegriCloud