git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.in [...] (SYSTEMSPEC): Remove -lwsock32. 

* configure.in [host *mingw*] (SYSTEMSPEC): Remove -lwsock32.
	* configure. Regenerate.
	* include/win32.h: Explicitly include winsock2.h
	* win32.cc (_Jv_platform_initialize): Require version 2.2 of
	Winsock api.

From-SVN: r85401
This commit is contained in:
Danny Smith 2004-08-01 04:29:31 +00:00 committed by Danny Smith
parent 6b3b5f0517
commit 5b5662eea7
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libjava/ChangeLog
View File

@ -1,3 +1,12 @@
2004-08-01 Danny Smith <dannysmith@users.sourceforge.net>
PR libgcj/16814
* configure.in [host *mingw*] (SYSTEMSPEC): Remove -lwsock32.
* configure. Regenerate.
* include/win32.h: Explicitly include winsock2.h
* win32.cc (_Jv_platform_initialize): Require version 2.2 of
Winsock api.
2004-07-30 Michael Koch <konqueror@gmx.de> 2004-07-30 Michael Koch <konqueror@gmx.de>
* java/util/zip/GZIPInputStream.java * java/util/zip/GZIPInputStream.java

2
libjava/configure vendored
View File

@ -3279,7 +3279,7 @@ test -d gnu/java/nio/channels || mkdir gnu/java/nio/channels
case "${host}" in case "${host}" in
*mingw*) *mingw*)
SYSTEMSPEC="-lgdi32 -lwsock32 -lws2_32" SYSTEMSPEC="-lgdi32 -lws2_32"
if test "${with_win32_nlsapi}" = "unicows"; then if test "${with_win32_nlsapi}" = "unicows"; then
SYSTEMSPEC="-lunicows $SYSTEMSPEC" SYSTEMSPEC="-lunicows $SYSTEMSPEC"
fi fi

2
libjava/configure.in
View File

@ -481,7 +481,7 @@ AC_LINK_FILES(gnu/java/nio/channels/natFileChannel${FILE-${PLATFORM}}.cc, gnu/ja
case "${host}" in case "${host}" in
*mingw*) *mingw*)
SYSTEMSPEC="-lgdi32 -lwsock32 -lws2_32" SYSTEMSPEC="-lgdi32 -lws2_32"
if test "${with_win32_nlsapi}" = "unicows"; then if test "${with_win32_nlsapi}" = "unicows"; then
SYSTEMSPEC="-lunicows $SYSTEMSPEC" SYSTEMSPEC="-lunicows $SYSTEMSPEC"
fi fi

2
libjava/include/win32.h
View File

@ -22,6 +22,8 @@ details. */
// Includes // Includes
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
// Force Winsock 2 interface.
#include <winsock2.h>
#include <windows.h> #include <windows.h>
#undef WIN32_LEAN_AND_MEAN #undef WIN32_LEAN_AND_MEAN
#undef STRICT #undef STRICT

2
libjava/win32.cc
View File

@ -256,7 +256,7 @@ _Jv_platform_initialize (void)
{ {
// Initialise winsock for networking // Initialise winsock for networking
WSADATA data; WSADATA data;
if (WSAStartup (MAKEWORD (1, 1), &data)) if (WSAStartup (MAKEWORD (2, 2), &data))
MessageBox (NULL, _T("Error initialising winsock library."), _T("Error"), MessageBox (NULL, _T("Error initialising winsock library."), _T("Error"),
MB_OK | MB_ICONEXCLAMATION); MB_OK | MB_ICONEXCLAMATION);