diff options
| -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 cf3a89e..004c39c 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 cd281fc..15e5db7 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> |