This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
WIN-30: natInetAddress.cc fixlet
- From: Adam Megacz <patches at lists dot megacz dot com>
- To: java-patches at gcc dot gnu dot org
- Date: 27 Feb 2002 16:59:05 -0800
- Subject: WIN-30: natInetAddress.cc fixlet
- Organization: Myself
Committed as shown below; I figure this one is small enough to be
considered 'touching win32-only stuff'...
- a
2002-02-27 Adam Megacz <adam@xwt.org>
* java/net/natInetAddress.cc: Changed USE_WINSOCK to WIN32, added
'#undef STRICT'.
Index: natInetAddress.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/natInetAddress.cc,v
retrieving revision 1.18
diff -u -r1.18 natInetAddress.cc
--- natInetAddress.cc 2001/05/24 05:40:37 1.18
+++ natInetAddress.cc 2002/02/28 01:02:21
@@ -10,16 +10,17 @@
#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 @@
#include <netdb.h>
#endif
-#endif /* USE_WINSOCK */
+#endif /* WIN32 */
#include <gcj/cni.h>
#include <jvm.h>