diff options
Diffstat (limited to 'charset')
-rw-r--r-- | charset/Makefile.am | 3 | ||||
-rw-r--r-- | charset/fribidi-char-sets.c | 11 |
2 files changed, 4 insertions, 10 deletions
diff --git a/charset/Makefile.am b/charset/Makefile.am index 6caf121..3709c1d 100644 --- a/charset/Makefile.am +++ b/charset/Makefile.am @@ -2,8 +2,7 @@ noinst_LTLIBRARIES = libfribidi-char-sets.la AM_CPPFLAGS = \ -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib \ - $(MISC_CFLAGS) + -I$(top_srcdir)/lib pkginclude_HEADERS = diff --git a/charset/fribidi-char-sets.c b/charset/fribidi-char-sets.c index f7156b4..5a9e21e 100644 --- a/charset/fribidi-char-sets.c +++ b/charset/fribidi-char-sets.c @@ -113,12 +113,8 @@ static FriBidiCharSetHandler char_sets[FRIBIDI_CHAR_SETS_NUM + 1] = { # undef _FRIBIDI_ADD_CHAR_SET_ONE2ONE }; -#if FRIBIDI_USE_GLIB+0 -# include <glib/gstrfuncs.h> -# define fribidi_strcasecmp g_ascii_strcasecmp -#else /* !FRIBIDI_USE_GLIB */ static char -toupper ( +fribidi_toupper ( /* input */ char c ) @@ -133,14 +129,13 @@ fribidi_strcasecmp ( const char *s2 ) { - while (*s1 && toupper (*s1) == toupper (*s2)) + while (*s1 && fribidi_toupper (*s1) == fribidi_toupper (*s2)) { s1++; s2++; } - return toupper (*s1) - toupper (*s2); + return fribidi_toupper (*s1) - fribidi_toupper (*s2); } -#endif /* !FRIBIDI_USE_GLIB */ FRIBIDI_ENTRY FriBidiCharSet fribidi_parse_charset ( |