diff options
| author | megacz <megacz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-28 01:03:37 +0000 |
|---|---|---|
| committer | megacz <megacz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-28 01:03:37 +0000 |
| commit | 487de8e0eb62e6ea2fe318203df05dc0d4e4d566 (patch) | |
| tree | 56ea18523848cecc8aa90fd4a1186e1d4ef88299 | |
| parent | 3496a6b8ac4897c673117b411479fc35b4e54377 (diff) | |
| download | gcc-487de8e0eb62e6ea2fe318203df05dc0d4e4d566.tar.gz | |
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
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/net/natInetAddress.cc | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index cf3a89eb3b3..004c39c3df7 100644 --- 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 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> |