diff dwtx/dwtxhelper/mangoicu/ICU.d @ 91:11e8159caf7a

make the mango icu fork work.
author Frank Benoit <benoit@tionex.de>
date Mon, 07 Jul 2008 15:53:07 +0200
parents 040da1cb0d76
children
line wrap: on
line diff
--- a/dwtx/dwtxhelper/mangoicu/ICU.d	Sun Jul 06 23:30:07 2008 +0200
+++ b/dwtx/dwtxhelper/mangoicu/ICU.d	Mon Jul 07 15:53:07 2008 +0200
@@ -40,7 +40,7 @@
 
 *******************************************************************************/
 
-module dwtx.dwthelper.mangoicu.ICU;
+module dwtx.dwtxhelper.mangoicu.ICU;
 
 /*******************************************************************************
 
@@ -98,20 +98,20 @@
 
         version (Win32)
                 {
-                protected static char[] icuuc = "icuuc"~ICULib~".dll";
-                protected static char[] icuin = "icuin"~ICULib~".dll";
+                package static char[] icuuc = "icuuc"~ICULib~".dll";
+                package static char[] icuin = "icuin"~ICULib~".dll";
                 }
         else
         version (linux)
                 {
-                protected static char[] icuuc = "libicuuc.so."~ICULib;
-                protected static char[] icuin = "libicui18n.so."~ICULib;
+                package static char[] icuuc = "libicuuc.so."~ICULib;
+                package static char[] icuin = "libicui18n.so."~ICULib;
                 }
         else
         version (darwin)
                 {
-                protected static char[] icuuc = "libicuuc.dylib."~ICULib;
-                protected static char[] icuin = "libicui18n.dylib."~ICULib;
+                package static char[] icuuc = "libicuuc.dylib."~ICULib;
+                package static char[] icuin = "libicui18n.dylib."~ICULib;
                 }
         else
            {
@@ -158,7 +158,7 @@
 
         ***********************************************************************/
 
-        protected enum  Error:int
+        package enum  UErrorCode:int
                         {
                         OK,
                         BufferOverflow=15
@@ -168,7 +168,7 @@
 
         ***********************************************************************/
 
-        protected static final bool isError (Error e)
+        package static final bool isError (UErrorCode e)
         {
                 return e > 0;
         }
@@ -177,7 +177,7 @@
 
         ***********************************************************************/
 
-        protected static final void exception (char[] msg)
+        package static final void exception (char[] msg)
         {
                 throw new ICUException (msg);
         }
@@ -186,7 +186,7 @@
 
         ***********************************************************************/
 
-        protected static final void testError (Error e, char[] msg)
+        package static final void testError (UErrorCode e, char[] msg)
         {
                 if (e > 0)
                     exception (msg);
@@ -296,6 +296,12 @@
         }
 }
 
+/*******************************************************************************
+
+*******************************************************************************/
+
+typedef void* UParseError;
+
 
 /*******************************************************************************
 
@@ -314,7 +320,7 @@
 
         ***********************************************************************/
 
-        class FunctionLoader
+        package static class FunctionLoader
         {
                 /***************************************************************