diff options
| author | Eric Anholt <eric@anholt.net> | 2014-04-21 10:14:09 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-04-22 14:52:42 -0700 |
| commit | 03934f1569b9e0a357e016350985b803f7b5572d (patch) | |
| tree | 4adb7e65041103817adff1150bf50c0d73cc8972 | |
| parent | 6d8f7991a7d38f81808499148e047edb0434611e (diff) | |
Shut up some const assignment warnings.
Trying to make all the callchain related to these const is too hard, and
it's not like marking things const helps either the developer or the
compiler.
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | t_repeat.c | 2 | ||||
| -rw-r--r-- | t_srccoords.c | 2 | ||||
| -rw-r--r-- | t_tsrccoords.c | 2 | ||||
| -rw-r--r-- | t_tsrccoords2.c | 2 | ||||
| -rw-r--r-- | tests.c | 4 |
5 files changed, 6 insertions, 6 deletions
@@ -73,7 +73,7 @@ repeat_test(Display *dpy, picture_info *win, picture_info *dst, int op, src.format = XRenderFindStandardFormat(dpy, PictStandardARGB32); src.pict = XRenderCreatePicture(dpy, src.d, src.format, CPComponentAlpha | CPRepeat, &pa); - src.name = "repeat picture"; + src.name = (char *)"repeat picture"; /* Fill to the first color */ XRenderComposite(dpy, PictOpSrc, c1->pict, None, src.pict, diff --git a/t_srccoords.c b/t_srccoords.c index 6e29e8a..1eae7d8 100644 --- a/t_srccoords.c +++ b/t_srccoords.c @@ -46,7 +46,7 @@ static picture_info *create_target_picture(Display *dpy) p->d = XCreatePixmap(dpy, DefaultRootWindow(dpy), 5, 5, 32); p->format = XRenderFindStandardFormat(dpy, PictStandardARGB32); p->pict = XRenderCreatePicture(dpy, p->d, p->format, 0, NULL); - p->name = "target picture"; + p->name = (char *)"target picture"; for (i = 0; i < 25; i++) { int x = i % 5; diff --git a/t_tsrccoords.c b/t_tsrccoords.c index 355880a..b931c4a 100644 --- a/t_tsrccoords.c +++ b/t_tsrccoords.c @@ -46,7 +46,7 @@ static picture_info *create_dot_picture(Display *dpy) p->d = XCreatePixmap(dpy, DefaultRootWindow(dpy), 5, 5, 32); p->format = XRenderFindStandardFormat(dpy, PictStandardARGB32); p->pict = XRenderCreatePicture(dpy, p->d, p->format, 0, NULL); - p->name = "dot picture"; + p->name = (char *)"dot picture"; for (i = 0; i < 25; i++) { int x = i % 5; diff --git a/t_tsrccoords2.c b/t_tsrccoords2.c index 0d83fd5..b083577 100644 --- a/t_tsrccoords2.c +++ b/t_tsrccoords2.c @@ -46,7 +46,7 @@ static picture_info *create_target_picture(Display *dpy) p->d = XCreatePixmap(dpy, DefaultRootWindow(dpy), 5, 5, 32); p->format = XRenderFindStandardFormat(dpy, PictStandardARGB32); p->pict = XRenderCreatePicture(dpy, p->d, p->format, 0, NULL); - p->name = "target picture"; + p->name = (char *)"target picture"; for (i = 0; i < 25; i++) { int x = i % 5; @@ -405,7 +405,7 @@ do_tests(Display *dpy, picture_info *win) picture_3x3.format = XRenderFindStandardFormat(dpy, PictStandardARGB32); picture_3x3.pict = XRenderCreatePicture(dpy, picture_3x3.d, picture_3x3.format, 0, NULL); - picture_3x3.name = "3x3 sample picture"; + picture_3x3.name = (char *)"3x3 sample picture"; for (i = 0; i < 9; i++) { int x = i % 3; int y = i / 3; @@ -424,7 +424,7 @@ do_tests(Display *dpy, picture_info *win) c.blue = (int)(colors[i].b*65535); pictures_solid[i].pict = XRenderCreateSolidFill(dpy, &c); pictures_solid[i].format = format_list[argb32index]; - pictures_solid[i].name = "Solid"; + pictures_solid[i].name = (char *)"Solid"; } #define RECORD_RESULTS() \ |