diff options
| author | Paul Eggert | 2011-02-05 01:49:52 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-02-05 01:49:52 -0800 |
| commit | cc618f4e69e92541a6595e6b15f35bea5a132640 (patch) | |
| tree | bcd31b121cf17d2b032abda451aba8d187e42d53 /src | |
| parent | 9bcaafce5351d270ac514e23cb69ff1a5fd35229 (diff) | |
| download | emacs-cc618f4e69e92541a6595e6b15f35bea5a132640.tar.gz emacs-cc618f4e69e92541a6595e6b15f35bea5a132640.zip | |
* xmenu.c: conform to C89 const rules
(xmenu_show, xdialog_show): Declare local var as char *, not
const char *, to stay compatible with C89 const rules.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xmenu.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9765bdc18d8..8d02825f8ce 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2011-02-05 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-02-05 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * xmenu.c: conform to C89 const rules | ||
| 4 | (xmenu_show, xdialog_show): Declare local var as char *, not | ||
| 5 | const char *, to stay compatible with C89 const rules. | ||
| 6 | |||
| 3 | * xdisp.c: conform to C89 pointer rules | 7 | * xdisp.c: conform to C89 pointer rules |
| 4 | (store_mode_line_noprop, display_string, reseat_to_string): | 8 | (store_mode_line_noprop, display_string, reseat_to_string): |
| 5 | (c_string_pos, number_of_chars, message_dolog): | 9 | (c_string_pos, number_of_chars, message_dolog): |
diff --git a/src/xmenu.c b/src/xmenu.c index 8ab10be8fac..ad1a764eab8 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -1668,7 +1668,7 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, | |||
| 1668 | { | 1668 | { |
| 1669 | /* Create a new pane. */ | 1669 | /* Create a new pane. */ |
| 1670 | Lisp_Object pane_name, prefix; | 1670 | Lisp_Object pane_name, prefix; |
| 1671 | const char *pane_string; | 1671 | char *pane_string; |
| 1672 | 1672 | ||
| 1673 | pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME); | 1673 | pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME); |
| 1674 | prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX); | 1674 | prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX); |
| @@ -2016,7 +2016,7 @@ xdialog_show (FRAME_PTR f, | |||
| 2016 | representing the text label and buttons. */ | 2016 | representing the text label and buttons. */ |
| 2017 | { | 2017 | { |
| 2018 | Lisp_Object pane_name, prefix; | 2018 | Lisp_Object pane_name, prefix; |
| 2019 | const char *pane_string; | 2019 | char *pane_string; |
| 2020 | pane_name = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME]; | 2020 | pane_name = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME]; |
| 2021 | prefix = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_PREFIX]; | 2021 | prefix = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_PREFIX]; |
| 2022 | pane_string = (NILP (pane_name) | 2022 | pane_string = (NILP (pane_name) |