ICU-1630 Move UMTX from utypes.h to umutex.h,

and remove unneeded references to mutex.h (so we can find multithreading issues more easily)

X-SVN-Rev: 7478

icu4c/source/common/umutex.h

@@ -20,9 +20,11 @@
 
 #include "unicode/utypes.h"
 
-#ifndef XP_CPLUSPLUS
-typedef void * Mutex;
-#endif
+/**
+ * Mutex data type.
+ * @internal
+ */
+typedef void *UMTX;
 
 /* APP_NO_THREADS is an old symbol. We'll honour it if present. */
 #ifdef APP_NO_THREADS

icu4c/source/common/unicode/utypes.h

@@ -504,12 +504,6 @@ typedef enum UErrorCode UErrorCode;
 U_CAPI const char * U_EXPORT2
 u_errorName(UErrorCode code);
 
-/**
- * Mutex data type.
- * @internal
- */
-typedef void *UMTX;
-
 
 
 /*===========================================================================*/

icu4c/source/common/unistr.cpp

@@ -24,7 +24,6 @@
 #include "cstring.h"
 #include "cmemory.h"
 #include "unicode/ustring.h"
-#include "mutex.h"
 #include "unicode/unistr.h"
 #include "unicode/unicode.h"
 #include "unicode/ucnv.h"

icu4c/source/i18n/datefmt.cpp

@@ -20,7 +20,6 @@
 #include "unicode/resbund.h"
 #include "unicode/datefmt.h"
 #include "unicode/smpdtfmt.h"
-#include "mutex.h"
 
 // *****************************************************************************
 // class DateFormat

icu4c/source/i18n/smpdtfmt.cpp

@@ -35,7 +35,6 @@
 #include "unicode/dcfmtsym.h"
 #include "unicode/unicode.h"
 #include "unicode/ustring.h"
-#include "mutex.h"
 #include <float.h>
 
 // *****************************************************************************

icu4c/source/i18n/ucol_bld.cpp

@@ -20,6 +20,7 @@
 #include "ucol_bld.h" 
 #include "ucln_in.h" 
 #include "unicode/uchar.h"
+#include "umutex.h"
 
 
 static const InverseTableHeader* invUCA = NULL;

icu4c/source/i18n/ucol_bld.h

@@ -31,7 +31,6 @@
 #include "ucol_wgt.h"
 
 #include "uhash.h"
-#include "umutex.h"
 #include "cpputils.h"
 
 #include "unicode/ustring.h"