You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jf...@apache.org on 2013/06/05 06:00:54 UTC

git commit: THRIFT-1824:many compile warning, becase Thread.h includes config.h Client: build Patch: Jake Farrell

Updated Branches:
  refs/heads/master 89be18365 -> 240df17f8


THRIFT-1824:many compile warning, becase Thread.h includes config.h
Client: build
Patch: Jake Farrell

Wrap our config.h with #ifndef CONFIG_H to guard against duplicate definitions


Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/240df17f
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/240df17f
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/240df17f

Branch: refs/heads/master
Commit: 240df17f85c8086bc5f9f17c28ce9e0936f65316
Parents: 89be183
Author: Jake Farrell <jf...@apache.org>
Authored: Tue Jun 4 23:59:34 2013 -0400
Committer: Jake Farrell <jf...@apache.org>
Committed: Tue Jun 4 23:59:34 2013 -0400

----------------------------------------------------------------------
 configure.ac |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/thrift/blob/240df17f/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 372f2d1..757922e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -574,6 +574,15 @@ fi
 AM_CONDITIONAL([WITH_BOOSTTHREADS], [test "x[$]ENABLE_BOOSTTHREADS" = "x1"])
 
 AC_CONFIG_HEADERS(config.h:config.hin)
+# gruard against pre defined config.h
+AH_TOP([
+#ifndef CONFIG_H
+#define CONFIG_H 
+])
+AH_BOTTOM([
+#endif
+])
+
 
 AC_CONFIG_FILES([
   Makefile