ICU-1567 This should fix some of the AIX 4.3/Visual Age 5 preprocessor problems

X-SVN-Rev: 7187

icu4c/source/common/uhash_us.cpp

@@ -14,6 +14,7 @@
 #include "hash.h"
 #include "uvector.h"
 #include "unicode/unistr.h"
+#include "unicode/uchar.h"
 
 /********************************************************************
  * PUBLIC UnicodeString support functions for UHashtable

icu4c/source/common/unicode/unistr.h

@@ -23,7 +23,7 @@
 
 #include "unicode/utypes.h"
 #include "unicode/rep.h"
-#include "unicode/uchar.h"
+/*#include "unicode/uchar.h"*/
 
 
 struct UConverter;          // unicode/ucnv.h
@@ -2183,7 +2183,7 @@ public:
    * @return A reference to this.
    * @draft ICU 1.8
    */
-  UnicodeString &foldCase(uint32_t options=U_FOLD_CASE_DEFAULT);
+  UnicodeString &foldCase(uint32_t options=0 /*U_FOLD_CASE_DEFAULT*/);
 
   //========================================
   // Access to the internal buffer

icu4c/source/common/unorm.cpp

@@ -22,15 +22,16 @@
 *                         supplementary code points, etc.
 */
 
+#include "cmemory.h"
+#include "ustr_imp.h"
+#include "umutex.h"
+#include "unormimp.h"
+
 #include "unicode/utypes.h"
 #include "unicode/ustring.h"
 #include "unicode/chariter.h"
 #include "unicode/udata.h"
 #include "unicode/unorm.h"
-#include "cmemory.h"
-#include "ustr_imp.h"
-#include "umutex.h"
-#include "unormimp.h"
 
 /*
  * This new implementation of the normalization code loads its data from

icu4c/source/common/ustrfmt.c

@@ -5,6 +5,9 @@
 **********************************************************************
 */
 
+#include <stdio.h>
+#include "cstring.h"
+
 #include "ustrfmt.h"
 
 U_CAPI double    U_EXPORT2

icu4c/source/common/ustrfmt.h

@@ -8,10 +8,7 @@
 #ifndef USTRFMT_H
 #define USTRFMT_H
 
-#include <stdlib.h>
-#include <stdio.h>
 #include "unicode/utypes.h"
-#include "cstring.h"
 
 U_CAPI double U_EXPORT2 
 uprv_strtod(const char* source, char** end);

icu4c/source/i18n/i18n.dsp

@@ -1749,6 +1749,10 @@ SOURCE=.\usrchimp.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\util.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\unicode\utrans.h
 
 !IF  "$(CFG)" == "i18n - Win32 Release"

icu4c/source/i18n/msgfmt.cpp

@@ -26,6 +26,7 @@
 #include "unicode/choicfmt.h"
 #include "unicode/ustring.h"
 #include "unicode/ucnv_err.h"
+#include "unicode/uchar.h"
 #include "ustrfmt.h"
 
 // *****************************************************************************

icu4c/source/i18n/nfrs.cpp

@@ -16,7 +16,11 @@
 #include "nfrs.h"
 #include "nfrule.h"
 #include "nfrlist.h"
+#include "unicode/uchar.h"
+
+#ifdef RBNF_DEBUG
 #include "cmemory.h"
+#endif
 
 U_NAMESPACE_BEGIN
 

icu4c/source/i18n/nfrule.cpp

@@ -18,6 +18,7 @@
 #include "unicode/rbnf.h"
 #include "unicode/tblcoll.h"
 #include "unicode/coleitr.h"
+#include "unicode/uchar.h"
 #include "nfrs.h"
 #include "nfrlist.h"
 #include "nfsubs.h"

icu4c/source/i18n/stsearch.cpp

@@ -7,9 +7,9 @@
 **********************************************************************
 */
 
-#include "unicode/stsearch.h"
 #include "cmemory.h"
 #include "usrchimp.h"
+#include "unicode/stsearch.h"
 
 U_NAMESPACE_BEGIN
 

icu4c/source/i18n/tolowtrn.cpp

@@ -9,6 +9,7 @@
 */
 
 #include "tolowtrn.h"
+#include "unicode/uchar.h"
 
 U_NAMESPACE_BEGIN
 

icu4c/source/i18n/toupptrn.cpp

@@ -9,6 +9,7 @@
 */
 
 #include "toupptrn.h"
+#include "unicode/uchar.h"
 
 U_NAMESPACE_BEGIN
 

icu4c/source/i18n/ucal.cpp

@@ -11,7 +11,6 @@
 #include "unicode/calendar.h"
 #include "unicode/timezone.h"
 #include "unicode/ustring.h"
-#include "cpputils.h"
 
 U_NAMESPACE_USE
 

icu4c/source/i18n/ucol.cpp

@@ -22,20 +22,19 @@
 #include "ucol_elm.h"
 #include "bocsu.h"
 
+#include "unormimp.h"
+#include "cstring.h"
+#include "umutex.h"
+#include "uhash.h"
+#include "ucln_in.h" 
+
 #include "unicode/uloc.h"
 #include "unicode/coll.h"
 #include "unicode/tblcoll.h"
 #include "unicode/coleitr.h"
 #include "unicode/unorm.h"
-#include "unicode/normlzr.h"
 #include "unicode/udata.h"
-
-#include "unormimp.h"
-#include "cpputils.h"
-#include "cstring.h"
-#include "umutex.h"
-#include "uhash.h"
-#include "ucln_in.h" 
+#include "unicode/uchar.h"
 
 #ifdef UCOL_DEBUG
 #include <stdio.h>

icu4c/source/i18n/ucol_bld.cpp

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

icu4c/source/i18n/unesctrn.cpp

@@ -8,9 +8,10 @@
 **********************************************************************
 */
 
+#include "cmemory.h"
 #include "unesctrn.h"
 #include "util.h"
-#include "cmemory.h"
+#include "unicode/uchar.h"
 
 U_NAMESPACE_BEGIN
 

icu4c/source/i18n/uni2name.cpp

@@ -10,6 +10,7 @@
 
 #include "uni2name.h"
 #include "unicode/unifilt.h"
+#include "unicode/uchar.h"
 
 U_NAMESPACE_BEGIN
 

icu4c/source/i18n/upropset.cpp

@@ -4,8 +4,8 @@
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 * $Source: /xsrl/Nsvn/icu/icu/source/i18n/Attic/upropset.cpp,v $
-* $Date: 2001/11/21 21:46:28 $
-* $Revision: 1.10 $
+* $Date: 2001/11/30 00:06:11 $
+* $Revision: 1.11 $
 **********************************************************************
 */
 #include "upropset.h"
@@ -14,6 +14,7 @@
 #include "unicode/uscript.h"
 #include "unicode/uniset.h"
 #include "unicode/parsepos.h"
+#include "unicode/uchar.h"
 #include "hash.h"
 #include "mutex.h"
 #include "ucln_in.h"

icu4c/source/i18n/util.cpp

@@ -9,6 +9,7 @@
 */
 
 #include "util.h"
+#include "unicode/uchar.h"
 
 // Define UChar constants using hex for EBCDIC compatibility
 // Used #define to reduce private static exports and memory access time.

icu4c/source/test/intltest/itercoll.cpp

@@ -12,6 +12,7 @@
 #include "itercoll.h"
 #include "unicode/schriter.h"
 #include "unicode/chariter.h"
+#include "unicode/uchar.h"
 
 #define ARRAY_LENGTH(array) (sizeof array / sizeof array[0])
 
@@ -21,7 +22,7 @@ CollationIteratorTest::CollationIteratorTest()
  : test1("What subset of all possible test cases?", ""),
    test2("has the highest probability of detecting", "")
 {
-    en_us = (RuleBasedCollator *)Collator::createInstance(Locale::US, status);
+    en_us = (RuleBasedCollator *)Collator::createInstance(Locale::getUS(), status);
 }
 
 CollationIteratorTest::~CollationIteratorTest()