diff options
| author | Adam Megacz <adam@xwt.org> | 2002-09-14 21:56:44 +0000 |
|---|---|---|
| committer | Adam Megacz <megacz@gcc.gnu.org> | 2002-09-14 21:56:44 +0000 |
| commit | 981f97c3641ce62391dffab22c971266cbaa057b (patch) | |
| tree | c154546639f37472f6e47805a91ec2c22a46c861 | |
| parent | 3eaf7a3ce7ae3ff1c0f51cd383dfb458bd214406 (diff) | |
| download | gcc-981f97c3641ce62391dffab22c971266cbaa057b.zip gcc-981f97c3641ce62391dffab22c971266cbaa057b.tar.gz gcc-981f97c3641ce62391dffab22c971266cbaa057b.tar.bz2 | |
natPlainDatagramSocket.cc: removed #include <ws2tcpip.h>; the mingw header is broken (conflicts with itself).
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
From-SVN: r57151
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/include/win32.h | 1 | ||||
| -rw-r--r-- | libjava/java/net/natPlainDatagramSocketImpl.cc | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 78f0f16..c46dec1 100644 --- 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 --- 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 --- 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 |