summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/http/httpd.hpp
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2011-12-01 09:09:05 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2011-12-01 09:09:05 +0000
commitcc233e5d2299655cb451f228e18a46ebfe163aea (patch)
tree3429d099fcaccd607e46da07f62efa7c920bcb2d /sca-cpp/trunk/modules/http/httpd.hpp
parentadfedb08bb13b1037314d59714f27ba252639da0 (diff)
Fix build and install errors on Mac OS X. Add missing scripts to forward IP ports on Mac OS X.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1209010 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/http/httpd.hpp')
-rw-r--r--sca-cpp/trunk/modules/http/httpd.hpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/sca-cpp/trunk/modules/http/httpd.hpp b/sca-cpp/trunk/modules/http/httpd.hpp
index c1cc16d08d..5f8b867c9b 100644
--- a/sca-cpp/trunk/modules/http/httpd.hpp
+++ b/sca-cpp/trunk/modules/http/httpd.hpp
@@ -45,13 +45,17 @@
#include <http_request.h>
// Ignore conversion warnings in HTTPD 2.3.15 header
#ifdef WANT_MAINTAINER_MODE
+#ifndef IS_DARWIN
#pragma GCC diagnostic ignored "-Wconversion"
#endif
+#endif
#include <http_protocol.h>
// Re-enable conversion warnings
#ifdef WANT_MAINTAINER_MODE
+#ifndef IS_DARWIN
#pragma GCC diagnostic warning "-Wconversion"
#endif
+#endif
// Hack to workaround compile error with HTTPD 2.3.8
#define aplog_module_index aplog_module_index = 0
#include <http_log.h>