FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

win32.h: Include ws2tcpip.h instead of winsock.h to obtain definition of the socklen_t type.

Browse source 
2003-02-12  Ranjit Mathew  <rmathew@hotmail.com>

	* include/win32.h: Include ws2tcpip.h instead of
	winsock.h to obtain definition of the socklen_t type.
	Remove IP_TOS definition - not needed with ws2tcpip.h
	(_Jv_connect): Correct slight formatting error.

From-SVN: r62801
This commit is contained in:
Ranjit Mathew 2003-02-13 00:07:37 +00:00 • committed by Tom Tromey
parent c6e2a538a6
commit ea5a63a26d
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libjava/ChangeLog
View file

@ -1,3 +1,10 @@
2003-02-12 Ranjit Mathew <rmathew@hotmail.com>
* include/win32.h: Include ws2tcpip.h instead of
winsock.h to obtain definition of the socklen_t type.
Remove IP_TOS definition - not needed with ws2tcpip.h
(_Jv_connect): Correct slight formatting error.
2003-02-12 Ranjit Mathew <rmathew@hotmail.com> 2003-02-12 Ranjit Mathew <rmathew@hotmail.com>
* jni.cc (_Jv_LookupJNIMethod): Modify to accept the * jni.cc (_Jv_LookupJNIMethod): Modify to accept the

8
libjava/include/win32.h
View file

@ -1,6 +1,6 @@
// win32.h -- Helper functions for Microsoft-flavored OSs. // win32.h -- Helper functions for Microsoft-flavored OSs.
/* Copyright (C) 2002 Free Software Foundation /* Copyright (C) 2002, 2003 Free Software Foundation
This file is part of libgcj. This file is part of libgcj.
@ -14,9 +14,7 @@ details. */
#include <windows.h> #include <windows.h>
#undef STRICT #undef STRICT
#undef __INSIDE_CYGWIN__ #include <ws2tcpip.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>
@ -74,7 +72,7 @@ _Jv_socket (int domain, int type, int protocol)
inline int inline int
_Jv_connect (jint fd, sockaddr *ptr, int len) _Jv_connect (jint fd, sockaddr *ptr, int len)
{ {
return ::connect (fd, ptr, len); return ::connect (fd, ptr, len);
} }
inline int inline int