summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-04-15 21:13:47 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-04-15 21:13:47 -0700
commite9829fdfd2c58205bd13046fd8a6d428527c0f66 (patch)
tree549811384487bff93f4bab2554e8ca60704a2c57
parent1086c0956d60c03c3b396bc7b79f6c020d5b3b14 (diff)
downloademacs-e9829fdfd2c58205bd13046fd8a6d428527c0f66.tar.gz
* xterm.c (x_create_toolkit_scroll_bar): Use const * for pointers
to read-only memory.
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xterm.c6
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 @@
2011-04-16 Paul Eggert <eggert@cs.ucla.edu>
+ * xterm.c (x_create_toolkit_scroll_bar): Use const * for pointers
+ to read-only memory.
+
* fns.c (vector): Remove; this old hack is no longer needed.
* 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)
Widget widget;
Arg av[20];
int ac = 0;
- char *scroll_bar_name = SCROLL_BAR_NAME;
+ char const *scroll_bar_name = SCROLL_BAR_NAME;
unsigned long pixel;
BLOCK_INPUT;
@@ -4674,8 +4674,8 @@ x_create_toolkit_scroll_bar (struct frame *f, struct scroll_bar *bar)
f->output_data.x->edit_widget, av, ac);
{
- char *initial = "";
- char *val = initial;
+ char const *initial = "";
+ char const *val = initial;
XtVaGetValues (widget, XtNscrollVCursor, (XtPointer) &val,
#ifdef XtNarrowScrollbars
XtNarrowScrollbars, (XtPointer) &xaw3d_arrow_scroll,