From: Yaakov Selkowitz <yselkowi@redhat.com>
To: cygwin-apps@cygwin.com
Subject: [PATCH setup 3/3] Use Winsock 2 throughout
Date: Fri, 08 Jan 2016 20:33:00 -0000 [thread overview]
Message-ID: <1452285157-12712-4-git-send-email-yselkowi@redhat.com> (raw)
In-Reply-To: <1452285157-12712-1-git-send-email-yselkowi@redhat.com>
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 <yselkowi@redhat.com>
---
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 <winsock2.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
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 <winsock2.h>
#include <stdio.h>
#include <stdlib.h>
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 <winsock.h>
+#include <winsock2.h>
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>
--
2.6.2
next prev parent reply other threads:[~2016-01-08 20:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-08 20:33 [PATCH setup 0/3] Drop Windows 9x-related code Yaakov Selkowitz
2016-01-08 20:33 ` [PATCH setup 2/3] nio-ie5: drop unnecessary LoadLibrary call Yaakov Selkowitz
2016-01-08 20:33 ` [PATCH setup 1/3] propsheet: drop support for Common Controls v4 Yaakov Selkowitz
2016-01-08 20:33 ` Yaakov Selkowitz [this message]
2016-01-09 13:54 ` [PATCH setup 0/3] Drop Windows 9x-related code Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452285157-12712-4-git-send-email-yselkowi@redhat.com \
--to=yselkowi@redhat.com \
--cc=cygwin-apps@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).