Commit 3106121c authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu
Browse files

Add const to array elements of font filter properties.

* font.c (font_filter_properties): Add const to array elements of properties args.
* font.h (font_filter_properties): Likewise.
* ftfont.c (ftfont_booleans, ftfont_non_booleans): Add const to array elements.
* w32font.c (w32font_booleans, w32font_non_booleans): Likewise.
parent da1fec2b
2010-11-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* font.c (font_filter_properties): Add const to array elements of
properties args.
* font.h (font_filter_properties): Likewise.
* ftfont.c (ftfont_booleans, ftfont_non_booleans): Add const to array
elements.
* w32font.c (w32font_booleans, w32font_non_booleans): Likewise.
2010-11-10 Michael Albinus <michael.albinus@gmx.de> 2010-11-10 Michael Albinus <michael.albinus@gmx.de>
   
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object. * dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
......
...@@ -3732,8 +3732,8 @@ font_get_frame_data (FRAME_PTR f, struct font_driver *driver) ...@@ -3732,8 +3732,8 @@ font_get_frame_data (FRAME_PTR f, struct font_driver *driver)
void void
font_filter_properties (Lisp_Object font, font_filter_properties (Lisp_Object font,
Lisp_Object alist, Lisp_Object alist,
const char *boolean_properties[], const char *const boolean_properties[],
const char *non_boolean_properties[]) const char *const non_boolean_properties[])
{ {
Lisp_Object it; Lisp_Object it;
int i; int i;
......
...@@ -823,8 +823,8 @@ extern void *font_get_frame_data (FRAME_PTR f, ...@@ -823,8 +823,8 @@ extern void *font_get_frame_data (FRAME_PTR f,
extern void font_filter_properties (Lisp_Object font, extern void font_filter_properties (Lisp_Object font,
Lisp_Object alist, Lisp_Object alist,
const char *boolean_properties[], const char *const boolean_properties[],
const char *non_boolean_properties[]); const char *const non_boolean_properties[]);
#ifdef HAVE_FREETYPE #ifdef HAVE_FREETYPE
extern struct font_driver ftfont_driver; extern struct font_driver ftfont_driver;
......
...@@ -2598,7 +2598,7 @@ ftfont_font_format (FcPattern *pattern, Lisp_Object filename) ...@@ -2598,7 +2598,7 @@ ftfont_font_format (FcPattern *pattern, Lisp_Object filename)
return intern ("unknown"); return intern ("unknown");
} }
static const char *ftfont_booleans [] = { static const char *const ftfont_booleans [] = {
":antialias", ":antialias",
":hinting", ":hinting",
":verticallayout", ":verticallayout",
...@@ -2611,7 +2611,7 @@ static const char *ftfont_booleans [] = { ...@@ -2611,7 +2611,7 @@ static const char *ftfont_booleans [] = {
NULL, NULL,
}; };
static const char *ftfont_non_booleans [] = { static const char *const ftfont_non_booleans [] = {
":family", ":family",
":familylang", ":familylang",
":style", ":style",
......
...@@ -2377,11 +2377,11 @@ in the font selection dialog. */) ...@@ -2377,11 +2377,11 @@ in the font selection dialog. */)
return DECODE_SYSTEM (build_string (buf)); return DECODE_SYSTEM (build_string (buf));
} }
static const char *w32font_booleans [] = { static const char *const w32font_booleans [] = {
NULL, NULL,
}; };
static const char *w32font_non_booleans [] = { static const char *const w32font_non_booleans [] = {
":script", ":script",
":antialias", ":antialias",
":style", ":style",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment