diff options
| author | Jake Farrell <jfarrell@apache.org> | 2013-04-01 21:39:03 -0400 |
|---|---|---|
| committer | Jake Farrell <jfarrell@apache.org> | 2013-04-01 21:39:03 -0400 |
| commit | c613cd2d9bc01ee4eb43a3d40a8691c736f7a316 (patch) | |
| tree | a97cff9b641a83fbaf27f18a33799a0c913517d2 /lib/cpp/src/thrift/transport | |
| parent | 8f9b4d86acfeb81f9418d38e0f3718e5526b1f70 (diff) | |
| download | thrift-c613cd2d9bc01ee4eb43a3d40a8691c736f7a316.tar.gz | |
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.
Diffstat (limited to 'lib/cpp/src/thrift/transport')
| -rw-r--r-- | lib/cpp/src/thrift/transport/TSocket.cpp | 3 | ||||
| -rw-r--r-- | 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 d2eb30e22..e59f4a1c8 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 ff5e541c0..b916a3e2a 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 |