From: Jake Farrell <jfarrell@apache.org>
Date: Tue, 2 Apr 2013 01:39:03 +0000 (-0400)
Subject: Thrift-1846:Restore socket.h header to support builds with Android NDK
X-Git-Tag: 0.9.1~148
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=c613cd2d9bc01ee4eb43a3d40a8691c736f7a316;p=common%2Fthrift.git

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.
---

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