Update ICU to 54.1 step 1

source/common/ustr_cnv.cpp

 /*
 *******************************************************************************
 *
-*   Copyright (C) 1998-2013, International Business Machines
+*   Copyright (C) 1998-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
-*   file name:  ustr_cnv.c
+*   file name:  ustr_cnv.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2004aug24
 *   created by: Markus W. Scherer
 *
 *   Character conversion functions moved here from ustring.c
 */
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_CONVERSION
 
 #include "unicode/ustring.h"
 #include "unicode/ucnv.h"
 #include "cstring.h"
 #include "cmemory.h"
-#include "cmutex.h"
+#include "umutex.h"
 #include "ustr_cnv.h"
 
 /* mutexed access to a shared default converter ----------------------------- */
 
 static UConverter *gDefaultConverter = NULL;
 
 U_CAPI UConverter* U_EXPORT2
 u_getDefaultConverter(UErrorCode *status)
 {
     UConverter *converter = NULL;
@@ skipping 206 matching lines @@
                   &err);
     u_releaseDefaultConverter(cnv);
     s1[len] = 0;
   } else {
     *s1 = 0;
   }
   return s1;
 }
 
 #endif