3 files changed, 4 insertions, 4 deletions
diff --git a/sca-cpp/trunk/components/webservice/axis2-service.cpp b/sca-cpp/trunk/components/webservice/axis2-service.cpp
index 498f3aea92..4df0543370 100644
--- a/sca-cpp/trunk/components/webservice/axis2-service.cpp
+++ b/sca-cpp/trunk/components/webservice/axis2-service.cpp
@@ -85,7 +85,7 @@ axiom_node_t *AXIS2_CALL serviceInvoke(unused axis2_svc_skeleton_t* svc_skeleton
     axis2_out_transport_info_t* tinfo = axis2_msg_ctx_get_out_transport_info(msg_ctx, env);
     axis2_apache2_out_transport_info_t* httpinfo = (axis2_apache2_out_transport_info_t*)tinfo;
     request_rec* r = httpinfo->request;
-    httpdDebugRequest(r, "webservice::serviceInvoke");
+    debug_httpdRequest(r, "webservice::serviceInvoke");
 
     // Parse the request Axiom node and construct request expression
     Axis2Context ax(env);
diff --git a/sca-cpp/trunk/components/webservice/axis2.hpp b/sca-cpp/trunk/components/webservice/axis2.hpp
index 47813ccd6d..62797d86f2 100644
--- a/sca-cpp/trunk/components/webservice/axis2.hpp
+++ b/sca-cpp/trunk/components/webservice/axis2.hpp
@@ -28,7 +28,7 @@
 #include "config.hpp"
 
 // Ignore redundant declarations in Axiom headers
-#ifdef WANT_MAINTAINER_MODE
+#ifdef WANT_MAINTAINER_WARNINGS
 #pragma GCC diagnostic ignored "-Wredundant-decls"
 #endif
 #include <axiom.h>
@@ -38,7 +38,7 @@
 #include <axis2_conf_ctx.h>
 #include <axis2_disp.h>
 #include <axis2_http_out_transport_info.h>
-#ifdef WANT_MAINTAINER_MODE
+#ifdef WANT_MAINTAINER_WARNINGS
 #pragma GCC diagnostic warning "-Wredundant-decls"
 #endif
 
diff --git a/sca-cpp/trunk/components/webservice/webservice-listener.cpp b/sca-cpp/trunk/components/webservice/webservice-listener.cpp
index 3741f7a1a7..e3347fa186 100644
--- a/sca-cpp/trunk/components/webservice/webservice-listener.cpp
+++ b/sca-cpp/trunk/components/webservice/webservice-listener.cpp
@@ -59,7 +59,7 @@ const failable<value> handle(const list<value>& params) {
 
     // Extract HTTPD request from the params
     request_rec* r = httpd::request(car(params));
-    httpdDebugRequest(r, "webservice::handle");
+    debug_httpdRequest(r, "webservice::handle");
 
     // Extract the relay lambda from the params and store it in the HTTPD request,
     // for later retrieval by our Axis2 service