summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/http/httpd.hpp
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2011-11-12 19:17:31 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2011-11-12 19:17:31 +0000
commit1fd773dda89c321d5558bcfefcc75742375d9541 (patch)
treeef86914ce4b276de211929a91d7675bb20c1b1a4 /sca-cpp/trunk/modules/http/httpd.hpp
parent7112b1604316c4b97fd15fccc586e2ac27dd0677 (diff)
Upgrade to HTTPD 2.3.15-beta.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1201308 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/http/httpd.hpp')
-rw-r--r--sca-cpp/trunk/modules/http/httpd.hpp8
1 files changed, 8 insertions, 0 deletions
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>