aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2010-11-10 18:02:54 +0900
committerYAMAMOTO Mitsuharu2010-11-10 18:02:54 +0900
commit3106121c9979ea4a2beee1485979f6e46e19f2a6 (patch)
treee3b910b4e159db23853b48d25bb09aa2f1702e71
parentda1fec2bc11a790e56d3473228f25c3dcfd59e59 (diff)
downloademacs-3106121c9979ea4a2beee1485979f6e46e19f2a6.tar.gz
emacs-3106121c9979ea4a2beee1485979f6e46e19f2a6.zip
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.
-rw-r--r--src/ChangeLog12
-rw-r--r--src/font.c4
-rw-r--r--src/font.h4
-rw-r--r--src/ftfont.c4
-rw-r--r--src/w32font.c4
5 files changed, 20 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d3bf1b58643..9804d57a9cf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
12010-11-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2
3 * font.c (font_filter_properties): Add const to array elements of
4 properties args.
5
6 * font.h (font_filter_properties): Likewise.
7
8 * ftfont.c (ftfont_booleans, ftfont_non_booleans): Add const to array
9 elements.
10
11 * w32font.c (w32font_booleans, w32font_non_booleans): Likewise.
12
12010-11-10 Michael Albinus <michael.albinus@gmx.de> 132010-11-10 Michael Albinus <michael.albinus@gmx.de>
2 14
3 * dbusbind.c (QCdbus_type_unix_fd): New Lisp object. 15 * dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
diff --git a/src/font.c b/src/font.c
index c08c211199c..ae933df75c8 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3732,8 +3732,8 @@ font_get_frame_data (FRAME_PTR f, struct font_driver *driver)
3732void 3732void
3733font_filter_properties (Lisp_Object font, 3733font_filter_properties (Lisp_Object font,
3734 Lisp_Object alist, 3734 Lisp_Object alist,
3735 const char *boolean_properties[], 3735 const char *const boolean_properties[],
3736 const char *non_boolean_properties[]) 3736 const char *const non_boolean_properties[])
3737{ 3737{
3738 Lisp_Object it; 3738 Lisp_Object it;
3739 int i; 3739 int i;
diff --git a/src/font.h b/src/font.h
index b2d7e49fa29..940eb3d001d 100644
--- a/src/font.h
+++ b/src/font.h
@@ -823,8 +823,8 @@ extern void *font_get_frame_data (FRAME_PTR f,
823 823
824extern void font_filter_properties (Lisp_Object font, 824extern void font_filter_properties (Lisp_Object font,
825 Lisp_Object alist, 825 Lisp_Object alist,
826 const char *boolean_properties[], 826 const char *const boolean_properties[],
827 const char *non_boolean_properties[]); 827 const char *const non_boolean_properties[]);
828 828
829#ifdef HAVE_FREETYPE 829#ifdef HAVE_FREETYPE
830extern struct font_driver ftfont_driver; 830extern struct font_driver ftfont_driver;
diff --git a/src/ftfont.c b/src/ftfont.c
index b0d10791379..d9ae9be0905 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -2598,7 +2598,7 @@ ftfont_font_format (FcPattern *pattern, Lisp_Object filename)
2598 return intern ("unknown"); 2598 return intern ("unknown");
2599} 2599}
2600 2600
2601static const char *ftfont_booleans [] = { 2601static const char *const ftfont_booleans [] = {
2602 ":antialias", 2602 ":antialias",
2603 ":hinting", 2603 ":hinting",
2604 ":verticallayout", 2604 ":verticallayout",
@@ -2611,7 +2611,7 @@ static const char *ftfont_booleans [] = {
2611 NULL, 2611 NULL,
2612}; 2612};
2613 2613
2614static const char *ftfont_non_booleans [] = { 2614static const char *const ftfont_non_booleans [] = {
2615 ":family", 2615 ":family",
2616 ":familylang", 2616 ":familylang",
2617 ":style", 2617 ":style",
diff --git a/src/w32font.c b/src/w32font.c
index f489fe2d763..e7c34378e0d 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -2377,11 +2377,11 @@ in the font selection dialog. */)
2377 return DECODE_SYSTEM (build_string (buf)); 2377 return DECODE_SYSTEM (build_string (buf));
2378} 2378}
2379 2379
2380static const char *w32font_booleans [] = { 2380static const char *const w32font_booleans [] = {
2381 NULL, 2381 NULL,
2382}; 2382};
2383 2383
2384static const char *w32font_non_booleans [] = { 2384static const char *const w32font_non_booleans [] = {
2385 ":script", 2385 ":script",
2386 ":antialias", 2386 ":antialias",
2387 ":style", 2387 ":style",