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.
This commit is contained in:
parent
da1fec2bc1
commit
3106121c99
5 changed files with 20 additions and 8 deletions
|
@ -1,3 +1,15 @@
|
|||
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>
|
||||
|
||||
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
|
||||
|
|
|
@ -3732,8 +3732,8 @@ font_get_frame_data (FRAME_PTR f, struct font_driver *driver)
|
|||
void
|
||||
font_filter_properties (Lisp_Object font,
|
||||
Lisp_Object alist,
|
||||
const char *boolean_properties[],
|
||||
const char *non_boolean_properties[])
|
||||
const char *const boolean_properties[],
|
||||
const char *const non_boolean_properties[])
|
||||
{
|
||||
Lisp_Object it;
|
||||
int i;
|
||||
|
|
|
@ -823,8 +823,8 @@ extern void *font_get_frame_data (FRAME_PTR f,
|
|||
|
||||
extern void font_filter_properties (Lisp_Object font,
|
||||
Lisp_Object alist,
|
||||
const char *boolean_properties[],
|
||||
const char *non_boolean_properties[]);
|
||||
const char *const boolean_properties[],
|
||||
const char *const non_boolean_properties[]);
|
||||
|
||||
#ifdef HAVE_FREETYPE
|
||||
extern struct font_driver ftfont_driver;
|
||||
|
|
|
@ -2598,7 +2598,7 @@ ftfont_font_format (FcPattern *pattern, Lisp_Object filename)
|
|||
return intern ("unknown");
|
||||
}
|
||||
|
||||
static const char *ftfont_booleans [] = {
|
||||
static const char *const ftfont_booleans [] = {
|
||||
":antialias",
|
||||
":hinting",
|
||||
":verticallayout",
|
||||
|
@ -2611,7 +2611,7 @@ static const char *ftfont_booleans [] = {
|
|||
NULL,
|
||||
};
|
||||
|
||||
static const char *ftfont_non_booleans [] = {
|
||||
static const char *const ftfont_non_booleans [] = {
|
||||
":family",
|
||||
":familylang",
|
||||
":style",
|
||||
|
|
|
@ -2377,11 +2377,11 @@ in the font selection dialog. */)
|
|||
return DECODE_SYSTEM (build_string (buf));
|
||||
}
|
||||
|
||||
static const char *w32font_booleans [] = {
|
||||
static const char *const w32font_booleans [] = {
|
||||
NULL,
|
||||
};
|
||||
|
||||
static const char *w32font_non_booleans [] = {
|
||||
static const char *const w32font_non_booleans [] = {
|
||||
":script",
|
||||
":antialias",
|
||||
":style",
|
||||
|
|
Loading…
Add table
Reference in a new issue