From 611eadf85d265a2354d820eaf17da3c3d691abda Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sat, 8 Aug 2009 16:08:56 +0000
Subject: [PATCH] 2009-08-09  Tatsuhiro Tsujikawa 
 <t-tujikawa@users.sourceforge.net>

	Renamed xmlrpc::elements::PARAMS to xmlrpc::elements::A2_PARAMS
	because it causes compile error if PARAMS macro is defined.
	* src/XmlRpcElements.cc
	* src/XmlRpcElements.h
	* src/XmlRpcRequestParserStateImpl.cc
---
 ChangeLog                           | 8 ++++++++
 src/XmlRpcElements.cc               | 2 +-
 src/XmlRpcElements.h                | 2 +-
 src/XmlRpcRequestParserStateImpl.cc | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 274d13d6..49ea9716 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-09  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Renamed xmlrpc::elements::PARAMS to xmlrpc::elements::A2_PARAMS
+	because it causes compile error if PARAMS macro is defined.
+	* src/XmlRpcElements.cc
+	* src/XmlRpcElements.h
+	* src/XmlRpcRequestParserStateImpl.cc
+
 2009-07-26  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	* Release 1.5.1
diff --git a/src/XmlRpcElements.cc b/src/XmlRpcElements.cc
index 6fbc7e8e..5bfb7456 100644
--- a/src/XmlRpcElements.cc
+++ b/src/XmlRpcElements.cc
@@ -40,7 +40,7 @@ namespace elements {
 
 const std::string METHOD_CALL("methodCall");
 const std::string METHOD_NAME("methodName");
-const std::string PARAMS("params");
+const std::string A2_PARAMS("params");
 const std::string PARAM("param");
 const std::string VALUE("value");
 const std::string I4("i4");
diff --git a/src/XmlRpcElements.h b/src/XmlRpcElements.h
index 1b18ae12..bba2de11 100644
--- a/src/XmlRpcElements.h
+++ b/src/XmlRpcElements.h
@@ -45,7 +45,7 @@ namespace elements {
 
 extern const std::string METHOD_CALL;
 extern const std::string METHOD_NAME;
-extern const std::string PARAMS;
+extern const std::string A2_PARAMS;
 extern const std::string PARAM;
 extern const std::string VALUE;
 extern const std::string I4;
diff --git a/src/XmlRpcRequestParserStateImpl.cc b/src/XmlRpcRequestParserStateImpl.cc
index 57d3e2a4..cf088049 100644
--- a/src/XmlRpcRequestParserStateImpl.cc
+++ b/src/XmlRpcRequestParserStateImpl.cc
@@ -82,7 +82,7 @@ void MethodCallXmlRpcRequestParserState::beginElement
 {
   if(name == elements::METHOD_NAME) {
     stm->pushMethodNameState();
-  } else if(name == elements::PARAMS) {
+  } else if(name == elements::A2_PARAMS) {
     stm->setCurrentFrameValue(BDE::list());
     stm->pushParamsState();
   } else {