You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jk...@apache.org on 2017/02/20 13:04:44 UTC

thrift git commit: THRIFT-4077: fix Appveyor warnings (VS2015) in PlatformSocket.h Client: C++

Repository: thrift
Updated Branches:
  refs/heads/master 4d651ab06 -> 239233afb


THRIFT-4077: fix Appveyor warnings (VS2015) in PlatformSocket.h
Client: C++

This closes #1198


Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/239233af
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/239233af
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/239233af

Branch: refs/heads/master
Commit: 239233afb6fd5bd2fb81743e88303c9ac17d7edb
Parents: 4d651ab
Author: James E. King, III <jk...@apache.org>
Authored: Mon Feb 20 08:04:12 2017 -0500
Committer: James E. King, III <jk...@apache.org>
Committed: Mon Feb 20 08:04:12 2017 -0500

----------------------------------------------------------------------
 lib/cpp/src/thrift/transport/PlatformSocket.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/thrift/blob/239233af/lib/cpp/src/thrift/transport/PlatformSocket.h
----------------------------------------------------------------------
diff --git a/lib/cpp/src/thrift/transport/PlatformSocket.h b/lib/cpp/src/thrift/transport/PlatformSocket.h
index b8974ba..1890b60 100644
--- a/lib/cpp/src/thrift/transport/PlatformSocket.h
+++ b/lib/cpp/src/thrift/transport/PlatformSocket.h
@@ -23,6 +23,7 @@
 #  define _THRIFT_TRANSPORT_PLATFORM_SOCKET_H_
 
 #ifdef _WIN32
+#  include <winsock2.h>
 #  define THRIFT_GET_SOCKET_ERROR ::WSAGetLastError()
 #  define THRIFT_ERRNO (*_errno())
 #  define THRIFT_EINPROGRESS WSAEINPROGRESS
@@ -78,8 +79,8 @@
 #    define THRIFT_POLLOUT POLLOUT
 #  endif //WINVER
 #  define THRIFT_SHUT_RDWR SD_BOTH
-#  if _WIN32_WINNT < 0x0600
-#    define AI_ADDRCONFIG 0
+#  if !defined(AI_ADDRCONFIG)
+#    define AI_ADDRCONFIG 0x00000400
 #  endif
 #else //not _WIN32
 #  include <errno.h>