From 981f97c3641ce62391dffab22c971266cbaa057b Mon Sep 17 00:00:00 2001 From: Adam Megacz Date: Sat, 14 Sep 2002 21:56:44 +0000 Subject: [PATCH] natPlainDatagramSocket.cc: removed #include ; the mingw header is broken (conflicts with itself). 2002-09-14 Adam Megacz * java/net/natPlainDatagramSocket.cc: removed #include ; the mingw header is broken (conflicts with itself). * include/win32.h: included definition for IP_TOS to satisfy natPlainDatagramSocket.cc From-SVN: r57151 --- libjava/ChangeLog | 7 +++++++ libjava/include/win32.h | 1 + libjava/java/net/natPlainDatagramSocketImpl.cc | 1 - 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 78f0f161186..c46dec10bec 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2002-09-14 Adam Megacz + + * java/net/natPlainDatagramSocket.cc: removed #include + ; 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 * java/net/DatagramPacket.java (DatagramPacket): diff --git a/libjava/include/win32.h b/libjava/include/win32.h index da71b8be56a..a035cfc5c13 100644 --- a/libjava/include/win32.h +++ b/libjava/include/win32.h @@ -16,6 +16,7 @@ details. */ #undef __INSIDE_CYGWIN__ #include +#define IP_TOS 3 #include #include diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc index 6a29fb372ee..12eaf3be9d9 100644 --- a/libjava/java/net/natPlainDatagramSocketImpl.cc +++ b/libjava/java/net/natPlainDatagramSocketImpl.cc @@ -13,7 +13,6 @@ details. */ #ifdef WIN32 #include #include -#include #ifndef ENOPROTOOPT #define ENOPROTOOPT 109 #endif -- 2.30.2