From bf5ef2ad0e5c5f2151ab2b106c2daf71af7a34c6 Mon Sep 17 00:00:00 2001
From: Markus Scherer <markus.icu@gmail.com>
Date: Tue, 29 Nov 2011 22:54:44 +0000
Subject: [PATCH] ICU-8804 cast from uint16_t* to UChar* (different types on
 some platforms)

X-SVN-Rev: 30989
---
 icu4c/source/common/normalizer2impl.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/icu4c/source/common/normalizer2impl.cpp b/icu4c/source/common/normalizer2impl.cpp
index 1b405fd4a5f..e1c137d482d 100644
--- a/icu4c/source/common/normalizer2impl.cpp
+++ b/icu4c/source/common/normalizer2impl.cpp
@@ -620,11 +620,11 @@ Normalizer2Impl::getRawDecomposition(UChar32 c, UChar buffer[30], int32_t &lengt
             uint16_t rm0=*rawMapping;
             if(rm0<=MAPPING_LENGTH_MASK) {
                 length=rm0;
-                return rawMapping-rm0;
+                return (const UChar *)rawMapping-rm0;
             } else {
                 // Copy the normal mapping and replace its first two code units with rm0.
                 buffer[0]=(UChar)rm0;
-                u_memcpy(buffer+1, mapping+1+2, mLength-2);
+                u_memcpy(buffer+1, (const UChar *)mapping+1+2, mLength-2);
                 length=mLength-1;
                 return buffer;
             }