[sword-svn] r151 - in trunk/source: i18n io

[chrislit at www.crosswire.org]

Author: chrislit
Date: 2008-05-24 20:57:41 -0700 (Sat, 24 May 2008)
New Revision: 151

Modified:
   trunk/source/i18n/dtfmtsym.cpp
   trunk/source/i18n/regexcmp.cpp
   trunk/source/i18n/zonemeta.cpp
   trunk/source/io/ufile.c
Log:
ICU 4.0 d01 second pass commit

Modified: trunk/source/i18n/dtfmtsym.cpp
===================================================================
--- trunk/source/i18n/dtfmtsym.cpp	2008-05-25 00:45:33 UTC (rev 150)
+++ trunk/source/i18n/dtfmtsym.cpp	2008-05-25 03:57:41 UTC (rev 151)
@@ -1024,7 +1024,7 @@
         UErrorCode status = U_ZERO_ERROR;
         if (fZoneStrings) {
             // Create an istance of ZoneStringFormat by the custom zone strings array
-            fZSFLocal = new ZoneStringFormat(fZoneStrings, fZoneStringsRowCount,
+            fZSFLocal = new ZoneStringFormat((const UnicodeString* const*)fZoneStrings, fZoneStringsRowCount,
                 fZoneStringsColCount, status);
             if (U_FAILURE(status)) {
                 delete fZSFLocal;

Modified: trunk/source/i18n/regexcmp.cpp
===================================================================
--- trunk/source/i18n/regexcmp.cpp	2008-05-25 00:45:33 UTC (rev 150)
+++ trunk/source/i18n/regexcmp.cpp	2008-05-25 03:57:41 UTC (rev 151)
@@ -3791,7 +3791,7 @@
         error(U_REGEX_PROPERTY_SYNTAX);
         return 0;
     }
-    charName.extract(0, charName.length(), name, sizeof(name), US_INV);
+    charName.extract(0, charName.length(), name, (int)sizeof(name), US_INV);
 
     UChar32  theChar = u_charFromName(U_UNICODE_CHAR_NAME, name, fStatus);
     if (U_FAILURE(*fStatus)) {

Modified: trunk/source/i18n/zonemeta.cpp
===================================================================
--- trunk/source/i18n/zonemeta.cpp	2008-05-25 00:45:33 UTC (rev 150)
+++ trunk/source/i18n/zonemeta.cpp	2008-05-25 03:57:41 UTC (rev 151)
@@ -453,7 +453,7 @@
         // We may skip aliases, because the bundle
         // contains only canonical IDs.  For now, try
         // all of them.
-        tzid->extract(0, tzid->length(), zidkey, sizeof(zidkey), US_INV);
+        tzid->extract(0, tzid->length(), zidkey, (int)sizeof(zidkey), US_INV);
         zidkey[sizeof(zidkey)-1] = 0; // NULL terminate just in case.
 
         // Replace '/' with ':'

Modified: trunk/source/io/ufile.c
===================================================================
--- trunk/source/io/ufile.c	2008-05-25 00:45:33 UTC (rev 150)
+++ trunk/source/io/ufile.c	2008-05-25 03:57:41 UTC (rev 151)
@@ -60,7 +60,7 @@
     uprv_memset(result, 0, sizeof(UFILE));
     result->fFileno = fileno(f);
 
-#ifdef U_WINDOWS
+#if defined(U_WINDOWS) && !defined(__BORLANDC__)
     if (0 <= result->fFileno && result->fFileno <= 2) {
         /* stdin, stdout and stderr need to be special cased for Windows 98 */
 #if _MSC_VER >= 1400