Only include public glib.h

Fixes error: #error "Only glib.h can be included directly."
with glib versions >= 2.31.

https://bugs.freedesktop.org/show_bug.cgi?id=83894
https://github.com/behdad/fribidi/pull/1

diff --git a/charset/fribidi-char-sets.c b/charset/fribidi-char-sets.c
index eedff8f5a5a7a04ed0b505616bf2c19b22fac7ca..214105fa502f3616fa0c0babf4fc9483030a42ef 100644 (file)
--- a/charset/fribidi-char-sets.c
+++ b/charset/fribidi-char-sets.c
@@ -114,7 +114,7 @@ static FriBidiCharSetHandler char_sets[FRIBIDI_CHAR_SETS_NUM + 1] = {
 };
 
 #if FRIBIDI_USE_GLIB+0
-# include <glib/gstrfuncs.h>
+# include <glib.h>
 # define fribidi_strcasecmp g_ascii_strcasecmp
 #else /* !FRIBIDI_USE_GLIB */
 static char

diff --git a/lib/mem.h b/lib/mem.h
index c3dde03353e2615dabda741db25e4fea6c1daaf0..ae6d3cdab436f44c8f5b74f89600f16efee90682 100644 (file)
--- a/lib/mem.h
+++ b/lib/mem.h
@@ -42,7 +42,7 @@
 #if FRIBIDI_USE_GLIB+0
 
 #ifndef __FRIBIDI_DOC
-# include <glib/gmem.h>
+# include <glib.h>
 #endif /* !__FRIBIDI_DOC */
 
 #define FriBidiMemChunk GMemChunk