summaryrefslogtreecommitdiff
path: root/libjava/include/win32.h
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2003-02-13 00:07:37 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2003-02-13 00:07:37 +0000
commit665516888171118c0935a9d56316f1ca800a4efa (patch)
treed6da6eadf649bca0a9055388844a082b83bb4281 /libjava/include/win32.h
parentff7c949aec42240a51dc5aa8f110b02c5b048e4f (diff)
downloadgcc-665516888171118c0935a9d56316f1ca800a4efa.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@62801 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/include/win32.h')
-rw-r--r--libjava/include/win32.h8
1 files changed, 3 insertions, 5 deletions
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 <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