From 9be4e687c49dad1f5d90e93e3b7247be16d50287 Mon Sep 17 00:00:00 2001
From: Konrad Grochowski <hcorg@minions.org.pl>
Date: Sat, 22 Jun 2013 22:03:31 +0200
Subject: [PATCH] THRIFT-2039 config.h --> thrift-config.h

Signed-off-by: Roger Meier <roger@apache.org>
---
 lib/cpp/src/thrift/TLogging.h                          | 4 +---
 lib/cpp/src/thrift/Thrift.h                            | 6 +++---
 lib/cpp/src/thrift/concurrency/BoostMonitor.cpp        | 5 ++---
 lib/cpp/src/thrift/concurrency/BoostMutex.cpp          | 5 ++---
 lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp  | 5 ++---
 lib/cpp/src/thrift/concurrency/Mutex.cpp               | 5 ++---
 lib/cpp/src/thrift/concurrency/PlatformThreadFactory.h | 2 +-
 lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp  | 5 ++---
 lib/cpp/src/thrift/concurrency/StdMonitor.cpp          | 5 ++---
 lib/cpp/src/thrift/concurrency/StdMutex.cpp            | 5 ++---
 lib/cpp/src/thrift/concurrency/StdThreadFactory.cpp    | 5 ++---
 lib/cpp/src/thrift/concurrency/Thread.h                | 4 +---
 lib/cpp/src/thrift/concurrency/ThreadManager.cpp       | 4 +---
 lib/cpp/src/thrift/concurrency/Util.cpp                | 5 ++---
 lib/cpp/src/thrift/server/TNonblockingServer.cpp       | 4 +---
 lib/cpp/src/thrift/server/TServer.cpp                  | 4 +---
 lib/cpp/src/thrift/server/TThreadPoolServer.cpp        | 4 +---
 lib/cpp/src/thrift/transport/TFileTransport.cpp        | 4 +---
 lib/cpp/src/thrift/transport/TPipeServer.cpp           | 4 +---
 lib/cpp/src/thrift/transport/TSSLSocket.cpp            | 5 ++---
 lib/cpp/src/thrift/transport/TServerSocket.cpp         | 5 ++---
 lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp  | 5 ++---
 lib/cpp/src/thrift/transport/TSocket.cpp               | 5 ++---
 lib/cpp/src/thrift/transport/TSocketPool.cpp           | 4 +---
 lib/cpp/src/thrift/transport/TTransportException.cpp   | 5 +----
 25 files changed, 40 insertions(+), 74 deletions(-)

diff --git a/lib/cpp/src/thrift/TLogging.h b/lib/cpp/src/thrift/TLogging.h
index ff571803..4c8bddc1 100644
--- a/lib/cpp/src/thrift/TLogging.h
+++ b/lib/cpp/src/thrift/TLogging.h
@@ -20,9 +20,7 @@
 #ifndef _THRIFT_TLOGGING_H_
 #define _THRIFT_TLOGGING_H_ 1
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <thrift/thrift-config.h>
 
 /**
  * Contains utility macros for debugging and logging.
diff --git a/lib/cpp/src/thrift/Thrift.h b/lib/cpp/src/thrift/Thrift.h
index 361ff6ae..03caa9ed 100644
--- a/lib/cpp/src/thrift/Thrift.h
+++ b/lib/cpp/src/thrift/Thrift.h
@@ -20,10 +20,10 @@
 #ifndef _THRIFT_THRIFT_H_
 #define _THRIFT_THRIFT_H_ 1
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include <thrift/transport/PlatformSocket.h>
+
+#include <thrift/thrift-config.h>
+
 #include <stdio.h>
 #include <assert.h>
 
diff --git a/lib/cpp/src/thrift/concurrency/BoostMonitor.cpp b/lib/cpp/src/thrift/concurrency/BoostMonitor.cpp
index ad33ce5f..1027157f 100644
--- a/lib/cpp/src/thrift/concurrency/BoostMonitor.cpp
+++ b/lib/cpp/src/thrift/concurrency/BoostMonitor.cpp
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
+
 #include <thrift/concurrency/Monitor.h>
 #include <thrift/concurrency/Exception.h>
 #include <thrift/concurrency/Util.h>
diff --git a/lib/cpp/src/thrift/concurrency/BoostMutex.cpp b/lib/cpp/src/thrift/concurrency/BoostMutex.cpp
index debe1b00..eb0c3c12 100644
--- a/lib/cpp/src/thrift/concurrency/BoostMutex.cpp
+++ b/lib/cpp/src/thrift/concurrency/BoostMutex.cpp
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
+
 #include <thrift/concurrency/Mutex.h>
 #include <thrift/concurrency/Util.h>
 
diff --git a/lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp b/lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp
index 784ff8e2..577329b5 100644
--- a/lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp
+++ b/lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
+
 #include <thrift/concurrency/BoostThreadFactory.h>
 #include <thrift/concurrency/Exception.h>
 
diff --git a/lib/cpp/src/thrift/concurrency/Mutex.cpp b/lib/cpp/src/thrift/concurrency/Mutex.cpp
index 5a4bb54c..3f7bb5b0 100644
--- a/lib/cpp/src/thrift/concurrency/Mutex.cpp
+++ b/lib/cpp/src/thrift/concurrency/Mutex.cpp
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
+
 #include <thrift/Thrift.h>
 #include <thrift/concurrency/Mutex.h>
 #include <thrift/concurrency/Util.h>
diff --git a/lib/cpp/src/thrift/concurrency/PlatformThreadFactory.h b/lib/cpp/src/thrift/concurrency/PlatformThreadFactory.h
index a370c49b..6e46dfce 100644
--- a/lib/cpp/src/thrift/concurrency/PlatformThreadFactory.h
+++ b/lib/cpp/src/thrift/concurrency/PlatformThreadFactory.h
@@ -20,7 +20,7 @@
 #ifndef _THRIFT_CONCURRENCY_PLATFORMTHREADFACTORY_H_
 #define _THRIFT_CONCURRENCY_PLATFORMTHREADFACTORY_H_ 1
 
-#include <config.h>
+#include <thrift/thrift-config.h>
 #if USE_BOOST_THREAD
 #  include <thrift/concurrency/BoostThreadFactory.h>
 #elif USE_STD_THREAD
diff --git a/lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp b/lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp
index 39dd886b..52ceead8 100644
--- a/lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp
+++ b/lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
+
 #include <thrift/concurrency/PosixThreadFactory.h>
 #include <thrift/concurrency/Exception.h>
 
diff --git a/lib/cpp/src/thrift/concurrency/StdMonitor.cpp b/lib/cpp/src/thrift/concurrency/StdMonitor.cpp
index 84cad668..cf257e62 100644
--- a/lib/cpp/src/thrift/concurrency/StdMonitor.cpp
+++ b/lib/cpp/src/thrift/concurrency/StdMonitor.cpp
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
+
 #include <thrift/concurrency/Monitor.h>
 #include <thrift/concurrency/Exception.h>
 #include <thrift/concurrency/Util.h>
diff --git a/lib/cpp/src/thrift/concurrency/StdMutex.cpp b/lib/cpp/src/thrift/concurrency/StdMutex.cpp
index 82a495f5..28f889ae 100644
--- a/lib/cpp/src/thrift/concurrency/StdMutex.cpp
+++ b/lib/cpp/src/thrift/concurrency/StdMutex.cpp
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
+
 #include <thrift/concurrency/Mutex.h>
 #include <thrift/concurrency/Util.h>
 
diff --git a/lib/cpp/src/thrift/concurrency/StdThreadFactory.cpp b/lib/cpp/src/thrift/concurrency/StdThreadFactory.cpp
index 443771d4..3239bd98 100644
--- a/lib/cpp/src/thrift/concurrency/StdThreadFactory.cpp
+++ b/lib/cpp/src/thrift/concurrency/StdThreadFactory.cpp
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
+
 #include <thrift/concurrency/StdThreadFactory.h>
 #include <thrift/concurrency/Exception.h>
 
diff --git a/lib/cpp/src/thrift/concurrency/Thread.h b/lib/cpp/src/thrift/concurrency/Thread.h
index 894f035f..70129338 100755
--- a/lib/cpp/src/thrift/concurrency/Thread.h
+++ b/lib/cpp/src/thrift/concurrency/Thread.h
@@ -24,9 +24,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <thrift/thrift-config.h>
 
 #if USE_BOOST_THREAD
 #  include <boost/thread.hpp>
diff --git a/lib/cpp/src/thrift/concurrency/ThreadManager.cpp b/lib/cpp/src/thrift/concurrency/ThreadManager.cpp
index eb3bc643..d5373dee 100644
--- a/lib/cpp/src/thrift/concurrency/ThreadManager.cpp
+++ b/lib/cpp/src/thrift/concurrency/ThreadManager.cpp
@@ -17,9 +17,7 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
 
 #include <thrift/concurrency/ThreadManager.h>
 #include <thrift/concurrency/Exception.h>
diff --git a/lib/cpp/src/thrift/concurrency/Util.cpp b/lib/cpp/src/thrift/concurrency/Util.cpp
index 868f52fd..7d9085ec 100644
--- a/lib/cpp/src/thrift/concurrency/Util.cpp
+++ b/lib/cpp/src/thrift/concurrency/Util.cpp
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
+
 #include <thrift/Thrift.h>
 #include <thrift/concurrency/Util.h>
 
diff --git a/lib/cpp/src/thrift/server/TNonblockingServer.cpp b/lib/cpp/src/thrift/server/TNonblockingServer.cpp
index 331198b3..12b4b8f3 100644
--- a/lib/cpp/src/thrift/server/TNonblockingServer.cpp
+++ b/lib/cpp/src/thrift/server/TNonblockingServer.cpp
@@ -19,9 +19,7 @@
 
 #define __STDC_FORMAT_MACROS
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
 
 #include <thrift/server/TNonblockingServer.h>
 #include <thrift/concurrency/Exception.h>
diff --git a/lib/cpp/src/thrift/server/TServer.cpp b/lib/cpp/src/thrift/server/TServer.cpp
index a3edd6d5..f4ce7441 100755
--- a/lib/cpp/src/thrift/server/TServer.cpp
+++ b/lib/cpp/src/thrift/server/TServer.cpp
@@ -17,9 +17,7 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
diff --git a/lib/cpp/src/thrift/server/TThreadPoolServer.cpp b/lib/cpp/src/thrift/server/TThreadPoolServer.cpp
index ef1f5227..6ff946b3 100644
--- a/lib/cpp/src/thrift/server/TThreadPoolServer.cpp
+++ b/lib/cpp/src/thrift/server/TThreadPoolServer.cpp
@@ -17,9 +17,7 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
 
 #include <thrift/server/TThreadPoolServer.h>
 #include <thrift/transport/TTransportException.h>
diff --git a/lib/cpp/src/thrift/transport/TFileTransport.cpp b/lib/cpp/src/thrift/transport/TFileTransport.cpp
index 258a18ce..c94ecd20 100644
--- a/lib/cpp/src/thrift/transport/TFileTransport.cpp
+++ b/lib/cpp/src/thrift/transport/TFileTransport.cpp
@@ -17,9 +17,7 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <thrift/thrift-config.h>
 
 #include <thrift/transport/TFileTransport.h>
 #include <thrift/transport/TTransportUtils.h>
diff --git a/lib/cpp/src/thrift/transport/TPipeServer.cpp b/lib/cpp/src/thrift/transport/TPipeServer.cpp
index 9c3b51bd..10fc69b2 100644
--- a/lib/cpp/src/thrift/transport/TPipeServer.cpp
+++ b/lib/cpp/src/thrift/transport/TPipeServer.cpp
@@ -17,9 +17,7 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
 #include <cstring>
 
 #include <thrift/transport/TPipe.h>
diff --git a/lib/cpp/src/thrift/transport/TSSLSocket.cpp b/lib/cpp/src/thrift/transport/TSSLSocket.cpp
index 1af8aa70..029c541b 100644
--- a/lib/cpp/src/thrift/transport/TSSLSocket.cpp
+++ b/lib/cpp/src/thrift/transport/TSSLSocket.cpp
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
+
 #include <errno.h>
 #include <string>
 #ifdef HAVE_ARPA_INET_H
diff --git a/lib/cpp/src/thrift/transport/TServerSocket.cpp b/lib/cpp/src/thrift/transport/TServerSocket.cpp
index 4cb0fd12..dc3cb586 100644
--- a/lib/cpp/src/thrift/transport/TServerSocket.cpp
+++ b/lib/cpp/src/thrift/transport/TServerSocket.cpp
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
+
 #include <cstring>
 #include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H
diff --git a/lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp b/lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp
index 5bf571dd..9af1445e 100644
--- a/lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp
+++ b/lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
+
 #include <thrift/transport/TSimpleFileTransport.h>
 
 #include <sys/types.h>
diff --git a/lib/cpp/src/thrift/transport/TSocket.cpp b/lib/cpp/src/thrift/transport/TSocket.cpp
index 1cffa70d..a9a752cf 100644
--- a/lib/cpp/src/thrift/transport/TSocket.cpp
+++ b/lib/cpp/src/thrift/transport/TSocket.cpp
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
+
 #include <cstring>
 #include <sstream>
 #ifdef HAVE_SYS_SOCKET_H
diff --git a/lib/cpp/src/thrift/transport/TSocketPool.cpp b/lib/cpp/src/thrift/transport/TSocketPool.cpp
index fdc54938..c468fb31 100644
--- a/lib/cpp/src/thrift/transport/TSocketPool.cpp
+++ b/lib/cpp/src/thrift/transport/TSocketPool.cpp
@@ -17,9 +17,7 @@
  * under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
 
 #include <algorithm>
 #include <iostream>
diff --git a/lib/cpp/src/thrift/transport/TTransportException.cpp b/lib/cpp/src/thrift/transport/TTransportException.cpp
index bd4f44b3..2c1f3032 100644
--- a/lib/cpp/src/thrift/transport/TTransportException.cpp
+++ b/lib/cpp/src/thrift/transport/TTransportException.cpp
@@ -21,9 +21,7 @@
 #include <boost/lexical_cast.hpp>
 #include <cstring>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <thrift/thrift-config.h>
 
 using std::string;
 using boost::lexical_cast;
@@ -31,4 +29,3 @@ using boost::lexical_cast;
 namespace apache { namespace thrift { namespace transport {
 
 }}} // apache::thrift::transport
-
-- 
2.17.1