You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jf...@apache.org on 2013/04/02 03:39:54 UTC
git commit: Thrift-1846:Restore socket.h header to support builds with Android NDK Client: cpp Patch: Nicolas Trésegnie
Updated Branches:
refs/heads/master 8f9b4d86a -> c613cd2d9
Thrift-1846:Restore socket.h header to support builds with Android NDK
Client: cpp
Patch: Nicolas Trésegnie
moves the <sys/socket.h> include from TSocket.h to the .cpp to minimize the risk of hidden dependencies.
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/c613cd2d
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/c613cd2d
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/c613cd2d
Branch: refs/heads/master
Commit: c613cd2d9bc01ee4eb43a3d40a8691c736f7a316
Parents: 8f9b4d8
Author: Jake Farrell <jf...@apache.org>
Authored: Mon Apr 1 21:39:03 2013 -0400
Committer: Jake Farrell <jf...@apache.org>
Committed: Mon Apr 1 21:39:03 2013 -0400
----------------------------------------------------------------------
lib/cpp/src/thrift/transport/TSocket.cpp | 3 +++
lib/cpp/src/thrift/transport/TSocket.h | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/c613cd2d/lib/cpp/src/thrift/transport/TSocket.cpp
----------------------------------------------------------------------
diff --git a/lib/cpp/src/thrift/transport/TSocket.cpp b/lib/cpp/src/thrift/transport/TSocket.cpp
index d2eb30e..e59f4a1 100644
--- a/lib/cpp/src/thrift/transport/TSocket.cpp
+++ b/lib/cpp/src/thrift/transport/TSocket.cpp
@@ -22,6 +22,9 @@
#endif
#include <cstring>
#include <sstream>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
#ifdef HAVE_SYS_UN_H
#include <sys/un.h>
#endif
http://git-wip-us.apache.org/repos/asf/thrift/blob/c613cd2d/lib/cpp/src/thrift/transport/TSocket.h
----------------------------------------------------------------------
diff --git a/lib/cpp/src/thrift/transport/TSocket.h b/lib/cpp/src/thrift/transport/TSocket.h
index ff5e541..b916a3e 100644
--- a/lib/cpp/src/thrift/transport/TSocket.h
+++ b/lib/cpp/src/thrift/transport/TSocket.h
@@ -29,9 +29,6 @@
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif