Add base64 encode/decode functions

[platform/upstream/glib.git] / glib / gunibreak.c

diff --git a/glib/gunibreak.c b/glib/gunibreak.c
index dddca45..9c12921 100644 (file)
--- a/glib/gunibreak.c
+++ b/glib/gunibreak.c
@@ -18,20 +18,30 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+
+#include <stdlib.h>
 
 #include "glib.h"
 #include "gunibreak.h"
+#include "galias.h"
 
-#include <stdlib.h>
+#define TPROP_PART1(Page, Char) \
+  ((break_property_table_part1[Page] >= G_UNICODE_MAX_TABLE_INDEX) \
+   ? (break_property_table_part1[Page] - G_UNICODE_MAX_TABLE_INDEX) \
+   : (break_property_data[break_property_table_part1[Page]][Char]))
 
+#define TPROP_PART2(Page, Char) \
+  ((break_property_table_part2[Page] >= G_UNICODE_MAX_TABLE_INDEX) \
+   ? (break_property_table_part2[Page] - G_UNICODE_MAX_TABLE_INDEX) \
+   : (break_property_data[break_property_table_part2[Page]][Char]))
 
-#define TPROP(Page, Char) \
-  ((break_property_table[Page] >= G_UNICODE_MAX_TABLE_INDEX) \
-   ? (break_property_table[Page] - G_UNICODE_MAX_TABLE_INDEX) \
-   : (break_property_data[break_property_table[Page]][Char]))
-
-#define PROP(Char) (((Char) > (G_UNICODE_LAST_CHAR)) ? G_UNICODE_UNASSIGNED : TPROP ((Char) >> 8, (Char) & 0xff))
+#define PROP(Char) \
+  (((Char) <= G_UNICODE_LAST_CHAR_PART1) \
+   ? TPROP_PART1 ((Char) >> 8, (Char) & 0xff) \
+   : (((Char) >= 0xe0000 && (Char) <= G_UNICODE_LAST_CHAR) \
+      ? TPROP_PART2 (((Char) - 0xe0000) >> 8, (Char) & 0xff) \
+      : G_UNICODE_BREAK_UNKNOWN))
 
 /**
  * g_unichar_break_type:
@@ -51,3 +61,6 @@ g_unichar_break_type (gunichar c)
 {
   return PROP (c);
 }
+
+#define __G_UNIBREAK_C__
+#include "galiasdef.c"