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.
---
t_repeat.c | 2 +-
t_srccoords.c | 2 +-
t_tsrccoords.c | 2 +-
t_tsrccoords2.c | 2 +-
tests.c | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/t_repeat.c b/t_repeat.c
index 4e26136..560d581 100644
--- a/t_repeat.c
+++ b/t_repeat.c
@@ -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 6aff6d5..3f23b95 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, RootWindow(dpy, 0), 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 124fdc9..1f78fb0 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, RootWindow(dpy, 0), 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 4449dca..123f936 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, RootWindow(dpy, 0), 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/tests.c b/tests.c
index 4dacb5b..d59b938 100644
--- a/tests.c
+++ b/tests.c
@@ -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() \
--
1.9.2
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
