diff options
| author | Ranjit Mathew <rmathew@hotmail.com> | 2003-02-13 00:07:37 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2003-02-13 00:07:37 +0000 |
| commit | ea5a63a26dd6ecc4e8702bc2324d71f3ed2a27e9 (patch) | |
| tree | d6da6eadf649bca0a9055388844a082b83bb4281 | |
| parent | c6e2a538a67c465f87597f5dbb0a09e6e8785d76 (diff) | |
| download | gcc-ea5a63a26dd6ecc4e8702bc2324d71f3ed2a27e9.zip gcc-ea5a63a26dd6ecc4e8702bc2324d71f3ed2a27e9.tar.gz gcc-ea5a63a26dd6ecc4e8702bc2324d71f3ed2a27e9.tar.bz2 | |
win32.h: Include ws2tcpip.h instead of winsock.h to obtain definition of the socklen_t type.
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
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/include/win32.h | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4fbf40c..adb1ee2 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,12 @@ 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> + * jni.cc (_Jv_LookupJNIMethod): Modify to accept the size of the arguments for a JNI function. For Win32, modify to search for all forms of possible exported diff --git a/libjava/include/win32.h b/libjava/include/win32.h index 1d06df0..4330c79 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 <windows.h> #undef STRICT -#undef __INSIDE_CYGWIN__ -#include <winsock.h> -#define IP_TOS 3 +#include <ws2tcpip.h> #include <gcj/cni.h> #include <java/util/Properties.h> @@ -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 |