diff options
| author | Paul Eggert | 2011-04-15 21:13:47 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-15 21:13:47 -0700 |
| commit | e9829fdfd2c58205bd13046fd8a6d428527c0f66 (patch) | |
| tree | 549811384487bff93f4bab2554e8ca60704a2c57 /src | |
| parent | 1086c0956d60c03c3b396bc7b79f6c020d5b3b14 (diff) | |
| download | emacs-e9829fdfd2c58205bd13046fd8a6d428527c0f66.tar.gz emacs-e9829fdfd2c58205bd13046fd8a6d428527c0f66.zip | |
* xterm.c (x_create_toolkit_scroll_bar): Use const * for pointers
to read-only memory.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/xterm.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ec6a1a28429..bbe008ce96c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-04-16 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-04-16 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * xterm.c (x_create_toolkit_scroll_bar): Use const * for pointers | ||
| 4 | to read-only memory. | ||
| 5 | |||
| 3 | * fns.c (vector): Remove; this old hack is no longer needed. | 6 | * fns.c (vector): Remove; this old hack is no longer needed. |
| 4 | 7 | ||
| 5 | * xsmfns.c (create_client_leader_window): Rename shadowing arg. | 8 | * xsmfns.c (create_client_leader_window): Rename shadowing arg. |
diff --git a/src/xterm.c b/src/xterm.c index e0f38aab2c2..121ac22c72f 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -4522,7 +4522,7 @@ x_create_toolkit_scroll_bar (struct frame *f, struct scroll_bar *bar) | |||
| 4522 | Widget widget; | 4522 | Widget widget; |
| 4523 | Arg av[20]; | 4523 | Arg av[20]; |
| 4524 | int ac = 0; | 4524 | int ac = 0; |
| 4525 | char *scroll_bar_name = SCROLL_BAR_NAME; | 4525 | char const *scroll_bar_name = SCROLL_BAR_NAME; |
| 4526 | unsigned long pixel; | 4526 | unsigned long pixel; |
| 4527 | 4527 | ||
| 4528 | BLOCK_INPUT; | 4528 | BLOCK_INPUT; |
| @@ -4674,8 +4674,8 @@ x_create_toolkit_scroll_bar (struct frame *f, struct scroll_bar *bar) | |||
| 4674 | f->output_data.x->edit_widget, av, ac); | 4674 | f->output_data.x->edit_widget, av, ac); |
| 4675 | 4675 | ||
| 4676 | { | 4676 | { |
| 4677 | char *initial = ""; | 4677 | char const *initial = ""; |
| 4678 | char *val = initial; | 4678 | char const *val = initial; |
| 4679 | XtVaGetValues (widget, XtNscrollVCursor, (XtPointer) &val, | 4679 | XtVaGetValues (widget, XtNscrollVCursor, (XtPointer) &val, |
| 4680 | #ifdef XtNarrowScrollbars | 4680 | #ifdef XtNarrowScrollbars |
| 4681 | XtNarrowScrollbars, (XtPointer) &xaw3d_arrow_scroll, | 4681 | XtNarrowScrollbars, (XtPointer) &xaw3d_arrow_scroll, |