From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 62076 invoked by alias); 8 Jan 2016 20:33:14 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 61850 invoked by uid 89); 8 Jan 2016 20:33:13 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.3 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=lws2_32, Hx-languages-length:1781 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 08 Jan 2016 20:33:12 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id CA1227AE88 for ; Fri, 8 Jan 2016 20:33:10 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-42.rdu2.redhat.com [10.10.116.42]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u08KX7PD002874 (version=TLSv1/SSLv3 cipher=AES256-SHA256 bits=256 verify=NO) for ; Fri, 8 Jan 2016 15:33:10 -0500 From: Yaakov Selkowitz To: cygwin-apps@cygwin.com Subject: [PATCH setup 3/3] Use Winsock 2 throughout Date: Fri, 08 Jan 2016 20:33:00 -0000 Message-Id: <1452285157-12712-4-git-send-email-yselkowi@redhat.com> In-Reply-To: <1452285157-12712-1-git-send-email-yselkowi@redhat.com> References: <1452285157-12712-1-git-send-email-yselkowi@redhat.com> X-SW-Source: 2016-01/txt/msg00010.txt.bz2 Winsock 2 was shipped with Windows 98. * Makefile.am (@SETUP@_LDADD): Link with ws2_32 instead of wsock32. * nio-ftp.cc: Include winsock2.h instead of winsock.h. * nio-http.cc: Ditto. * simpsock.cc: Ditto. Signed-off-by: Yaakov Selkowitz --- Makefile.am | 2 +- nio-ftp.cc | 2 +- nio-http.cc | 2 +- simpsock.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 248db8d..9a0c80a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,7 +103,7 @@ inilint_SOURCES = \ @SETUP@_LDADD = \ libgetopt++/libgetopt++.la -lgcrypt -lgpg-error -llzma -lbz2 -lz \ - -lshlwapi -lcomctl32 -lole32 -lwsock32 -lpsapi -luuid -lntdll -lwininet -lmingw32 + -lshlwapi -lcomctl32 -lole32 -lws2_32 -lpsapi -luuid -lntdll -lwininet -lmingw32 @SETUP@_LDFLAGS = -mwindows -Wc,-static -static-libtool-libs @SETUP@_SOURCES = \ AntiVirus.cc \ diff --git a/nio-ftp.cc b/nio-ftp.cc index 9f19189..171e3a2 100644 --- a/nio-ftp.cc +++ b/nio-ftp.cc @@ -26,7 +26,7 @@ static const char *cvsid = #include "LogSingleton.h" #include "win32.h" -#include "winsock.h" +#include #include #include #include diff --git a/nio-http.cc b/nio-http.cc index 7336baf..259dc0f 100644 --- a/nio-http.cc +++ b/nio-http.cc @@ -22,7 +22,7 @@ static const char *cvsid = #endif #include "win32.h" -#include "winsock.h" +#include #include #include diff --git a/simpsock.cc b/simpsock.cc index 852f043..88f843b 100644 --- a/simpsock.cc +++ b/simpsock.cc @@ -21,7 +21,7 @@ static const char *cvsid = #endif #include "win32.h" -#include +#include #include #include #include -- 2.6.2