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

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4fbf40c..adb1ee2 100644 (file)
--- 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 (file)
--- 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