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
This commit is contained in:
Adam Megacz 2002-09-14 21:56:44 +00:00 committed by Adam Megacz
parent 3eaf7a3ce7
commit 981f97c364
3 changed files with 8 additions and 1 deletions

View File

@ -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):

View File

@ -16,6 +16,7 @@ details. */
#undef __INSIDE_CYGWIN__
#include <winsock.h>
#define IP_TOS 3
#include <gcj/cni.h>
#include <java/util/Properties.h>

View File

@ -13,7 +13,6 @@ details. */
#ifdef WIN32
#include <errno.h>
#include <string.h>
#include <ws2tcpip.h>
#ifndef ENOPROTOOPT
#define ENOPROTOOPT 109
#endif