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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 213dbcf3998d4eb1c40496415515b38df7cc5d7c..a08c38662a7a1eb778d52add13c05e94fcd752f6 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -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>
 
        * java/util/zip/GZIPInputStream.java

diff --git a/libjava/configure b/libjava/configure
index ddbb9b3dd43cbcfb0599ea1c42608e71c0fdb27e..79166413f58b6156aabb1d6891718ab7a37d4838 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -3279,7 +3279,7 @@ test -d gnu/java/nio/channels || mkdir gnu/java/nio/channels
 
 case "${host}" in
     *mingw*)
-      SYSTEMSPEC="-lgdi32 -lwsock32 -lws2_32"
+      SYSTEMSPEC="-lgdi32 -lws2_32"
       if test "${with_win32_nlsapi}" = "unicows"; then
         SYSTEMSPEC="-lunicows $SYSTEMSPEC"
       fi

diff --git a/libjava/configure.in b/libjava/configure.in
index ebefa0115fc7a7ef87aac39f0f9173c6df5ee92b..dc7b8799353a0e549dbc3422c0f59278c59753a9 100644 (file)
--- a/libjava/configure.in
+++ b/libjava/configure.in
@@ -481,7 +481,7 @@ AC_LINK_FILES(gnu/java/nio/channels/natFileChannel${FILE-${PLATFORM}}.cc, gnu/ja
 
 case "${host}" in
     *mingw*)
-      SYSTEMSPEC="-lgdi32 -lwsock32 -lws2_32"
+      SYSTEMSPEC="-lgdi32 -lws2_32"
       if test "${with_win32_nlsapi}" = "unicows"; then
         SYSTEMSPEC="-lunicows $SYSTEMSPEC"
       fi

diff --git a/libjava/include/win32.h b/libjava/include/win32.h
index 8dd2964e6372fbda9bed145eb22c0bb14b445e80..a660616ae4c834aa58dcc0ac7fb7cc84ba060c7e 100644 (file)
--- a/libjava/include/win32.h
+++ b/libjava/include/win32.h
@@ -22,6 +22,8 @@ details.  */
 
 // Includes
 #define WIN32_LEAN_AND_MEAN
+// Force Winsock 2 interface.
+#include <winsock2.h>
 #include <windows.h>
 #undef WIN32_LEAN_AND_MEAN
 #undef STRICT

diff --git a/libjava/win32.cc b/libjava/win32.cc
index 027333be73852e6444e5f3bb4b96e5506546bb1a..c337922d2965606f73ae7e02eea581ca501f9fcb 100644 (file)
--- a/libjava/win32.cc
+++ b/libjava/win32.cc
@@ -256,7 +256,7 @@ _Jv_platform_initialize (void)
 {
   // Initialise winsock for networking
   WSADATA data;
-  if (WSAStartup (MAKEWORD (1, 1), &data))
+  if (WSAStartup (MAKEWORD (2, 2), &data))
     MessageBox (NULL, _T("Error initialising winsock library."), _T("Error"),
     MB_OK | MB_ICONEXCLAMATION);