Build with Clang/LLVM when available.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1164964 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 14 insertions, 8 deletions

diff --git a/sca-cpp/trunk/modules/http/httpd.hpp b/sca-cpp/trunk/modules/http/httpd.hpp
index 9440fe343e..3a651fa496 100644
--- a/sca-cpp/trunk/modules/http/httpd.hpp
+++ b/sca-cpp/trunk/modules/http/httpd.hpp
@@ -34,6 +34,8 @@
 #include <apr_base64.h>
 
 #include <httpd.h>
+// Hack to workaround compile error with CLang/LLVM
+#undef strtoul
 // Hack to workaround compile error with HTTPD 2.3.8
 #define new new_
 #include <http_config.h>
@@ -427,10 +429,6 @@ const bool redirectFilters(ap_filter_t* f, request_rec* from, request_rec* to) {
  * Create an HTTPD internal redirect request.
  * Similar to httpd/modules/http/http_request.c::internal_internal_redirect.
  */
-extern "C" {
-    AP_DECLARE(ap_conf_vector_t*) ap_create_request_config(apr_pool_t *p);
-}
-
 const failable<request_rec*, int> internalRedirectRequest(const string& nr_uri, request_rec* r) {
     if (ap_is_recursion_limit_exceeded(r))
         return mkfailure<request_rec*, int>(HTTP_INTERNAL_SERVER_ERROR);
@@ -498,10 +496,6 @@ const failable<request_rec*, int> internalRedirectRequest(const string& nr_uri,
  * Process an HTTPD internal redirect request.
  * Similar to httpd/modules/http/http_request.c::ap_internal_redirect.
  */
-extern "C" {
-    AP_DECLARE(int) ap_invoke_handler(request_rec *r);
-}
-
 const int internalRedirect(request_rec* nr) {
     int status = ap_run_quick_handler(nr, 0);
     if (status == DECLINED) {
diff --git a/sca-cpp/trunk/modules/http/mod-ssltunnel.cpp b/sca-cpp/trunk/modules/http/mod-ssltunnel.cpp
index 0fd347c469..521b86626d 100644
--- a/sca-cpp/trunk/modules/http/mod-ssltunnel.cpp
+++ b/sca-cpp/trunk/modules/http/mod-ssltunnel.cpp
@@ -34,6 +34,11 @@
 #include "httpd.hpp"
 #include "http.hpp"
 
+// Ignore cast align warnings in APR macros
+#ifdef WANT_MAINTAINER_MODE
+#pragma GCC diagnostic ignored "-Wcast-align"
+#endif
+
 extern "C" {
 extern module AP_MODULE_DECLARE_DATA mod_tuscany_ssltunnel;
 }
@@ -212,6 +217,7 @@ int tunnel(conn_rec* conn, const string& ca, const string& cert, const string& k
                     if (rl == 0)
                         return close(conn, csock);
 
+
                     // Send bucket to client
                     debug(string(data, rl), "modssltunnel::tunnel::sendToClient");
                     APR_BRIGADE_INSERT_TAIL(ob, apr_bucket_transient_create(data, rl, conn->bucket_alloc));
@@ -364,3 +370,9 @@ module AP_MODULE_DECLARE_DATA mod_tuscany_ssltunnel = {
 };
 
 }
+
+// Reenable cast align warnings
+#ifdef WANT_MAINTAINER_MODE
+#pragma GCC diagnostic warning "-Wcast-align"
+#endif
+