From: Roger Meier <roger@apache.org>
Date: Sat, 6 Oct 2012 06:00:47 +0000 (+0000)
Subject: THRIFT-1690
X-Git-Tag: 0.9.1~287
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=1f4be7e857d24863a808e9ec8ad52d08e5e90cab;p=common%2Fthrift.git

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

diff --git a/lib/cpp/src/thrift/transport/TServerSocket.h b/lib/cpp/src/thrift/transport/TServerSocket.h
index fb93eb4d..2ee75931 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 4f091c48..ecf6d79c 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