[sword-svn] r139 - in trunk/source: common/unicode i18n io

[chrislit at www.crosswire.org]

Author: chrislit
Date: 2007-09-25 19:41:30 -0700 (Tue, 25 Sep 2007)
New Revision: 139

Modified:
   trunk/source/common/unicode/pwin32.h
   trunk/source/i18n/persncal.cpp
   trunk/source/io/ufile.c
Log:
ICU 3.8 update (pass 2)

Modified: trunk/source/common/unicode/pwin32.h
===================================================================
--- trunk/source/common/unicode/pwin32.h	2007-09-26 01:50:24 UTC (rev 138)
+++ trunk/source/common/unicode/pwin32.h	2007-09-26 02:41:30 UTC (rev 139)
@@ -28,12 +28,12 @@
 
 #if defined(__BORLANDC__)
 #define U_HAVE_PLACEMENT_NEW 0
-#define U_HAVE_INTTYPES_H 1
+#define U_HAVE_INTTYPES_H 0
 #define __STDC_CONSTANT_MACROS
 #endif
 
 /* _MSC_VER is used to detect the Microsoft compiler. */
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__BORLANDC__)
 #define U_INT64_IS_LONG_LONG 0
 #else
 #define U_INT64_IS_LONG_LONG 1

Modified: trunk/source/i18n/persncal.cpp
===================================================================
--- trunk/source/i18n/persncal.cpp	2007-09-26 01:50:24 UTC (rev 138)
+++ trunk/source/i18n/persncal.cpp	2007-09-26 02:41:30 UTC (rev 139)
@@ -222,8 +222,8 @@
     { -140742, -140742,  144683,  140742 }, // YEAR_WOY
     {       0,       0,       6,       6 }, // DOW_LOCAL
     {   -2500,   -2500,    2500,    2500 }, // EXTENDED_YEAR
-    {/*      -1,      -1,      -1,      -1 */}, // JULIAN_DAY
-    {/*      -1,      -1,      -1,      -1 */}, // MILLISECONDS_IN_DAY
+    /*{      -1,      -1,      -1,      -1 },*/ // JULIAN_DAY
+    /*{      -1,      -1,      -1,      -1 },*/ // MILLISECONDS_IN_DAY
 };
 static const int32_t MONTH_COUNT[12][4]  = {
     //len len2   st  st2

Modified: trunk/source/io/ufile.c
===================================================================
--- trunk/source/io/ufile.c	2007-09-26 01:50:24 UTC (rev 138)
+++ trunk/source/io/ufile.c	2007-09-26 02:41:30 UTC (rev 139)
@@ -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