mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-22 21:45:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

natPlainDatagramSocket.cc: removed #include <ws2tcpip.h>; the mingw header is broken (conflicts with itself).

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
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> 2002-09-13 Michael Koch <konqueror@gmx.de>
* java/net/DatagramPacket.java (DatagramPacket): * java/net/DatagramPacket.java (DatagramPacket):

1
libjava/include/win32.h
View File

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

1
libjava/java/net/natPlainDatagramSocketImpl.cc
View File

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