Include toplevel glib.h only

diff --git a/lib/common.h b/lib/common.h
index 2a269e1973c97d210e5b55b729cd74cb954175fe..c9728c0ac6faff5a5e0e7665fa9a779f188eea3f 100644 (file)
--- a/lib/common.h
+++ b/lib/common.h
@@ -1,10 +1,10 @@
 /* FriBidi
  * common.h - common include for library sources
  *
- * $Id: common.h,v 1.20 2008-04-08 21:38:23 behdad Exp $
+ * $Id: common.h,v 1.21 2010-02-24 19:40:04 behdad Exp $
  * $Author: behdad $
- * $Date: 2008-04-08 21:38:23 $
- * $Revision: 1.20 $
+ * $Date: 2010-02-24 19:40:04 $
+ * $Revision: 1.21 $
  * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/lib/common.h,v $
  *
  * Author:
@@ -57,7 +57,7 @@
 #  define SIZEOF_VOID_P GLIB_SIZEOF_VOID_P
 # endif        /* !SIZEOF_VOID_P */
 # ifndef __FRIBIDI_DOC
-#  include <glib/gmem.h>
+#  include <glib.h>
 # endif        /* !__FRIBIDI_DOC */
 # ifndef fribidi_malloc
 #  define fribidi_malloc g_try_malloc
@@ -65,12 +65,12 @@
 # endif        /* !fribidi_malloc */
 # ifndef fribidi_assert
 #  ifndef __FRIBIDI_DOC
-#   include <glib/gmessages.h>
+#   include <glib.h>
 #  endif /* !__FRIBIDI_DOC */
 #  define fribidi_assert g_assert
 # endif        /* !fribidi_assert */
 # ifndef __FRIBIDI_DOC
-#  include <glib/gmacros.h>
+#  include <glib.h>
 # endif        /* !__FRIBIDI_DOC */
 # ifndef FRIBIDI_BEGIN_STMT
 #  define FRIBIDI_BEGIN_STMT G_STMT_START {

diff --git a/lib/fribidi-common.h b/lib/fribidi-common.h
index 9b33f4356c17ab4ff17b33d4347313728483c7a6..90f689edc76ca1471a67bab7be2c05560b2c6c0b 100644 (file)
--- a/lib/fribidi-common.h
+++ b/lib/fribidi-common.h
@@ -1,10 +1,10 @@
 /* FriBidi
  * fribidi-common.h - common include for library headers
  *
- * $Id: fribidi-common.h,v 1.13 2007-04-05 16:13:24 behdad Exp $
+ * $Id: fribidi-common.h,v 1.14 2010-02-24 19:40:04 behdad Exp $
  * $Author: behdad $
- * $Date: 2007-04-05 16:13:24 $
- * $Revision: 1.13 $
+ * $Date: 2010-02-24 19:40:04 $
+ * $Revision: 1.14 $
  * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/lib/fribidi-common.h,v $
  *
  * Author:
@@ -62,7 +62,7 @@
 
 #if FRIBIDI_USE_GLIB+0
 # ifndef __FRIBIDI_DOC
-#  include <glib/gmacros.h>
+#  include <glib.h>
 # endif        /* !__FRIBIDI_DOC */
 # define FRIBIDI_BEGIN_DECLS           G_BEGIN_DECLS
 # define FRIBIDI_END_DECLS             G_END_DECLS

diff --git a/lib/fribidi-types.h b/lib/fribidi-types.h
index 26a4c2afb9ae085aad5bfab61e60aadbcebf1d6f..be0527f628a590405a4ca830836933a7cca4bd87 100644 (file)
--- a/lib/fribidi-types.h
+++ b/lib/fribidi-types.h
@@ -1,10 +1,10 @@
 /* FriBidi
  * fribidi-types.h - define data types for the rest of the library
  *
- * $Id: fribidi-types.h,v 1.12 2006-01-31 03:23:13 behdad Exp $
+ * $Id: fribidi-types.h,v 1.13 2010-02-24 19:40:04 behdad Exp $
  * $Author: behdad $
- * $Date: 2006-01-31 03:23:13 $
- * $Revision: 1.12 $
+ * $Date: 2010-02-24 19:40:04 $
+ * $Revision: 1.13 $
  * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/lib/fribidi-types.h,v $
  *
  * Author:
@@ -40,8 +40,7 @@
 
 #if FRIBIDI_USE_GLIB+0
 # ifndef __FRIBIDI_DOC
-#  include <glib/gtypes.h>
-#  include <glib/gunicode.h>
+#  include <glib.h>
 # endif        /* !__FRIBIDI_DOC */
 # define FRIBIDI_INT8_LOCAL            gint8
 # define FRIBIDI_INT16_LOCAL           gint16