From c613cd2d9bc01ee4eb43a3d40a8691c736f7a316 Mon Sep 17 00:00:00 2001
From: Jake Farrell <jfarrell@apache.org>
Date: Mon, 1 Apr 2013 21:39:03 -0400
Subject: [PATCH] =?utf8?q?Thrift-1846:Restore=20socket.h=20header=20to=20s?=
 =?utf8?q?upport=20builds=20with=20Android=20NDK=20Client:=20cpp=20Patch:?=
 =?utf8?q?=20Nicolas=20Tr=C3=A9segnie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

moves the <sys/socket.h> include from TSocket.h to the .cpp to minimize the risk of hidden dependencies.
---
 lib/cpp/src/thrift/transport/TSocket.cpp | 3 +++
 lib/cpp/src/thrift/transport/TSocket.h   | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/cpp/src/thrift/transport/TSocket.cpp b/lib/cpp/src/thrift/transport/TSocket.cpp
index d2eb30e2..e59f4a1c 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
diff --git a/lib/cpp/src/thrift/transport/TSocket.h b/lib/cpp/src/thrift/transport/TSocket.h
index ff5e541c..b916a3e2 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
-- 
2.17.1