Move glib library into a subdirectory, make all GLib include files include

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

diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c
index 2de7db7..194c283 100644 (file)
--- a/glib/gunidecomp.c
+++ b/glib/gunidecomp.c
@@ -4,16 +4,16 @@
  *  Copyright 2000 Red Hat, Inc.
  *
  * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
+ * modify it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
  *
  * The Gnome Library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with the Gnome Library; see the file COPYING.LIB.  If not,
  * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  *   Boston, MA 02111-1307, USA.
@@ -29,13 +29,13 @@
 /* We cheat a bit and cast type values to (char *).  We detect these
    using the &0xff trick.  */
 #define CC(Page, Char) \
-  (((((int) (combining_class_table[Page])) & 0xff) \
-    == ((int) combining_class_table[Page])) \
-   ? ((int) combining_class_table[Page]) \
+  ((((GPOINTER_TO_INT(combining_class_table[Page])) & 0xff) \
+    == GPOINTER_TO_INT(combining_class_table[Page])) \
+   ? GPOINTER_TO_INT(combining_class_table[Page]) \
    : (combining_class_table[Page][Char]))
 
 #define COMBINING_CLASS(Char) \
-     (((Char) > (UNICODE_LAST_CHAR)) ? 0 : CC((Char) >> 8, (Char) & 0xff))
+     (((Char) > (G_UNICODE_LAST_CHAR)) ? 0 : CC((Char) >> 8, (Char) & 0xff))
 
 /* Compute the canonical ordering of a string in-place.  */
 void