Merge change 9368

* changes:
  libcore/.../rg_apache_harmony_xml_ExpatParser: in C++, the return type of strchr(const char*) is 'const char*' instead of 'char *'.

1 files changed, 1 insertions, 1 deletions

diff --git a/xml/src/main/native/org_apache_harmony_xml_ExpatParser.cpp b/xml/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
index 7149272..40a4116 100644
--- a/xml/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
+++ b/xml/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
@@ -479,7 +479,7 @@ static void bufferAndInvoke(jmethodID method, void* data, const char* text,
  * @returns index of the separator
  */
 static int findSeparator(const char* s) {
-    char* pointer = strchr(s, '|');
+    const char* pointer = strchr(s, '|');
     return pointer == NULL ? -1 : pointer - s;
 }