Mercurial > hg > release > icedtea7-forest-2.0 > jdk

changeset 3562:2381e810330b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6983248: net/net001 and net/net003 fail on WinXP with JDK7-B108 Summary: Using closesocket to close socket handler to avoid invalid C runtime parameter exception. Reviewed-by: alanb, phh, dcubed, dsamersoff, coleenp, acorn
author zgu
date Thu, 20 Jan 2011 10:45:58 -0500
parents 9596a600758c
children d03e47de3a89
files src/windows/demo/jvmti/hprof/hprof_md.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/demo/jvmti/hprof/hprof_md.c	Wed Jan 19 19:00:30 2011 -0800
+++ b/src/windows/demo/jvmti/hprof/hprof_md.c	Thu Jan 20 10:45:58 2011 -0500
@@ -29,12 +29,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+// To ensure winsock2.h is used, it has to be included ahead of
+// windows.h, which includes winsock.h by default.
+#include <winsock2.h>
 #include <windows.h>
 #include <io.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <mmsystem.h>
-#include <winsock2.h>
 #include <fcntl.h>
 #include <process.h>
 
@@ -147,7 +149,7 @@
 void
 md_close(int filedes)
 {
-    (void)close(filedes);
+    (void)closesocket(filedes);
 }
 
 int