2002-09-14 Adam Megacz <adam@xwt.org>

        * java/net/natPlainDatagramSocket.cc: removed #include
        <ws2tcpip.h>; the mingw header is broken (conflicts with itself).
        * include/win32.h: included definition for IP_TOS to satisfy
        natPlainDatagramSocket.cc

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@57151 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 78f0f16..c46dec1 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-14  Adam Megacz <adam@xwt.org>
+       
+       * java/net/natPlainDatagramSocket.cc: removed #include
+       <ws2tcpip.h>; the mingw header is broken (conflicts with itself).
+       * include/win32.h: included definition for IP_TOS to satisfy
+       natPlainDatagramSocket.cc
+       
 2002-09-13  Michael Koch  <konqueror@gmx.de>
        
        * java/net/DatagramPacket.java (DatagramPacket):

diff --git a/libjava/include/win32.h b/libjava/include/win32.h
index da71b8b..a035cfc 100644 (file)
--- a/libjava/include/win32.h
+++ b/libjava/include/win32.h
@@ -16,6 +16,7 @@ details.  */
 
 #undef __INSIDE_CYGWIN__
 #include <winsock.h>
+#define IP_TOS 3
 #include <gcj/cni.h>
 #include <java/util/Properties.h>
 

diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc
index 6a29fb3..12eaf3b 100644 (file)
--- a/libjava/java/net/natPlainDatagramSocketImpl.cc
+++ b/libjava/java/net/natPlainDatagramSocketImpl.cc
@@ -13,7 +13,6 @@ details.  */
 #ifdef WIN32
 #include <errno.h>
 #include <string.h>
-#include <ws2tcpip.h>
 #ifndef ENOPROTOOPT
 #define ENOPROTOOPT 109
 #endif