From ea5a63a26dd6ecc4e8702bc2324d71f3ed2a27e9 Mon Sep 17 00:00:00 2001 From: Ranjit Mathew Date: Thu, 13 Feb 2003 00:07:37 +0000 Subject: [PATCH] win32.h: Include ws2tcpip.h instead of winsock.h to obtain definition of the socklen_t type. 2003-02-12 Ranjit Mathew * 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 --- libjava/ChangeLog | 7 +++++++ libjava/include/win32.h | 8 +++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4fbf40cfa75..adb1ee2540a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2003-02-12 Ranjit Mathew + + * 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 * jni.cc (_Jv_LookupJNIMethod): Modify to accept the diff --git a/libjava/include/win32.h b/libjava/include/win32.h index 1d06df0663c..4330c79d397 100644 --- a/libjava/include/win32.h +++ b/libjava/include/win32.h @@ -1,6 +1,6 @@ // 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. @@ -14,9 +14,7 @@ details. */ #include #undef STRICT -#undef __INSIDE_CYGWIN__ -#include -#define IP_TOS 3 +#include #include #include @@ -74,7 +72,7 @@ _Jv_socket (int domain, int type, int protocol) inline int _Jv_connect (jint fd, sockaddr *ptr, int len) { - return ::connect (fd, ptr, len); + return ::connect (fd, ptr, len); } inline int