From 5623ca5bf39ae6fc04442d309aa6bec923d569f6 Mon Sep 17 00:00:00 2001
From: Behnam Esfahbod <behnam@behnam.es>
Date: Sat, 6 Dec 2014 01:45:17 -0800
Subject: 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
---
 charset/fribidi-char-sets.c | 2 +-
 lib/mem.h                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charset/fribidi-char-sets.c b/charset/fribidi-char-sets.c
index eedff8f..214105f 100644
--- 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 c3dde03..ae6d3cd 100644
--- 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
-- 
cgit v1.2.1