Commit 981f97c3 by Adam Megacz Committed by Adam Megacz

natPlainDatagramSocket.cc: removed #include <ws2tcpip.h>; the mingw header is…

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
parent 3eaf7a3c
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> 2002-09-13 Michael Koch <konqueror@gmx.de>
* java/net/DatagramPacket.java (DatagramPacket): * java/net/DatagramPacket.java (DatagramPacket):
......
...@@ -16,6 +16,7 @@ details. */ ...@@ -16,6 +16,7 @@ details. */
#undef __INSIDE_CYGWIN__ #undef __INSIDE_CYGWIN__
#include <winsock.h> #include <winsock.h>
#define IP_TOS 3
#include <gcj/cni.h> #include <gcj/cni.h>
#include <java/util/Properties.h> #include <java/util/Properties.h>
......
...@@ -13,7 +13,6 @@ details. */ ...@@ -13,7 +13,6 @@ details. */
#ifdef WIN32 #ifdef WIN32
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <ws2tcpip.h>
#ifndef ENOPROTOOPT #ifndef ENOPROTOOPT
#define ENOPROTOOPT 109 #define ENOPROTOOPT 109
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment