summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Meier <roger@apache.org>2012-10-06 06:00:47 +0000
committerRoger Meier <roger@apache.org>2012-10-06 06:00:47 +0000
commit1f4be7e857d24863a808e9ec8ad52d08e5e90cab (patch)
tree32a89fa0bf621980ee264aefc8c0b5ab756bad5b
parentbe7493ee3275b6737c6f183a8b90e289820a51cd (diff)
downloadthrift-1f4be7e857d24863a808e9ec8ad52d08e5e90cab.tar.gz
THRIFT-1690
Non-linux OSes use int's in bsd socket calls as well. git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1394931 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--lib/cpp/src/thrift/transport/TServerSocket.h2
-rw-r--r--lib/cpp/src/thrift/transport/TSocket.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/cpp/src/thrift/transport/TServerSocket.h b/lib/cpp/src/thrift/transport/TServerSocket.h
index fb93eb4da..2ee759316 100644
--- a/lib/cpp/src/thrift/transport/TServerSocket.h
+++ b/lib/cpp/src/thrift/transport/TServerSocket.h
@@ -22,7 +22,7 @@
#include "TServerTransport.h"
#include <boost/shared_ptr.hpp>
-#ifdef __linux__
+#ifndef _WIN32
typedef int SOCKET;
#endif
diff --git a/lib/cpp/src/thrift/transport/TSocket.h b/lib/cpp/src/thrift/transport/TSocket.h
index 4f091c485..ecf6d79cc 100644
--- a/lib/cpp/src/thrift/transport/TSocket.h
+++ b/lib/cpp/src/thrift/transport/TSocket.h
@@ -32,7 +32,7 @@
#ifdef HAVE_NETDB_H
#include <netdb.h>
#endif
-#ifdef __linux__
+#ifndef _WIN32
typedef int SOCKET;
#endif