summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehnam Esfahbod <behnam@behnam.es>2014-12-06 01:45:17 -0800
committerBehnam Esfahbod <behnam@behnam.es>2014-12-06 01:54:29 -0800
commit5623ca5bf39ae6fc04442d309aa6bec923d569f6 (patch)
treece402ab42dbbc62e582de97118f92e9e6958dd5a
parent9ca217ae3acecd6e175ac2b0cb0da4f91e8a6399 (diff)
downloadfribidi-5623ca5bf39ae6fc04442d309aa6bec923d569f6.tar.gz
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
-rw-r--r--charset/fribidi-char-sets.c2
-rw-r--r--lib/mem.h2
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