From 1fd773dda89c321d5558bcfefcc75742375d9541 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 12 Nov 2011 19:17:31 +0000
Subject: Upgrade to HTTPD 2.3.15-beta.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1201308 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-cpp/trunk/modules/http/httpd.hpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'sca-cpp/trunk/modules/http/httpd.hpp')

diff --git a/sca-cpp/trunk/modules/http/httpd.hpp b/sca-cpp/trunk/modules/http/httpd.hpp
index 3a651fa496..d413e6c288 100644
--- a/sca-cpp/trunk/modules/http/httpd.hpp
+++ b/sca-cpp/trunk/modules/http/httpd.hpp
@@ -43,7 +43,15 @@
 #include <http_core.h>
 #include <http_connection.h>
 #include <http_request.h>
+// Ignore conversion warnings in HTTPD 2.3.15 header
+#ifdef WANT_MAINTAINER_MODE
+#pragma GCC diagnostic ignored "-Wconversion"
+#endif
 #include <http_protocol.h>
+// Re-enable conversion warnings
+#ifdef WANT_MAINTAINER_MODE
+#pragma GCC diagnostic warning "-Wconversion"
+#endif
 // Hack to workaround compile error with HTTPD 2.3.8
 #define aplog_module_index aplog_module_index = 0
 #include <http_log.h>
-- 
cgit v1.2.3