summaryrefslogtreecommitdiff
path: root/src/ftfont.c
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-04-09 10:40:29 -0700
committerGlenn Morris <rgm@gnu.org>2011-04-09 10:40:29 -0700
commit8546720e6f25eb988e8215de6678798053031440 (patch)
tree224cd4541048b3cc2847c652dc0aa3347a58a381 /src/ftfont.c
parenta53e2e898b96c8024de5a1a413826a6a59dd6b54 (diff)
parent140745c368c00011226815fd2a891764340bf87f (diff)
downloademacs-8546720e6f25eb988e8215de6678798053031440.tar.gz
Merge from emacs-23; up to 2010-06-08T03:06:47Z!dann@ics.uci.edu.
Diffstat (limited to 'src/ftfont.c')
-rw-r--r--src/ftfont.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ftfont.c b/src/ftfont.c
index ad01149106e..06ba6d7fe25 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -160,7 +160,7 @@ static struct
static Lisp_Object
get_adstyle_property (FcPattern *p)
{
- char *str, *end;
+ unsigned char *str, *end;
Lisp_Object adstyle;
if (FcPatternGetString (p, FC_STYLE, 0, (FcChar8 **) &str) != FcResultMatch)
@@ -189,7 +189,7 @@ static Lisp_Object
ftfont_pattern_entity (FcPattern *p, Lisp_Object extra)
{
Lisp_Object key, cache, entity;
- char *file, *str;
+ unsigned char *file, *str;
int idx;
int numeric;
double dbl;