summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/AddTrap.c2
-rw-r--r--src/FillRects.c2
-rw-r--r--src/Glyph.c14
-rw-r--r--src/Picture.c2
-rw-r--r--src/Trap.c2
-rw-r--r--src/Tri.c6
-rw-r--r--src/Xrenderint.h4
7 files changed, 16 insertions, 16 deletions
diff --git a/src/AddTrap.c b/src/AddTrap.c
index 5d01114..5588ea3 100644
--- a/src/AddTrap.c
+++ b/src/AddTrap.c
@@ -60,7 +60,7 @@ XRenderAddTraps (Display *dpy,
}
SetReqLen (req, len, len);
len <<= 2;
- DataInt32 (dpy, (int *) traps, (long) len);
+ DataInt32 (dpy, (_Xconst int *) traps, (long) len);
ntrap -= n;
traps += n;
}
diff --git a/src/FillRects.c b/src/FillRects.c
index 0076f24..0a5cb57 100644
--- a/src/FillRects.c
+++ b/src/FillRects.c
@@ -70,7 +70,7 @@ XRenderFillRectangles (Display *dpy,
}
SetReqLen(req, len, len);
len <<= 2; /* watch out for macros... */
- Data16 (dpy, (short *) rectangles, len);
+ Data16 (dpy, (_Xconst short *) rectangles, len);
n_rects -= n;
rectangles += n;
}
diff --git a/src/Glyph.c b/src/Glyph.c
index 77041a7..4d1fa20 100644
--- a/src/Glyph.c
+++ b/src/Glyph.c
@@ -105,8 +105,8 @@ XRenderAddGlyphs (Display *dpy,
req->nglyphs = (CARD32) nglyphs;
len = (nglyphs * (SIZEOF (xGlyphInfo) + 4) + nbyte_images) >> 2;
SetReqLen(req, len, len);
- Data32 (dpy, (long *) gids, nglyphs * 4);
- Data16 (dpy, (short *) glyphs, nglyphs * SIZEOF (xGlyphInfo));
+ Data32 (dpy, (_Xconst long *) gids, nglyphs * 4);
+ Data16 (dpy, (_Xconst short *) glyphs, nglyphs * SIZEOF (xGlyphInfo));
Data (dpy, images, nbyte_images);
UnlockDisplay(dpy);
SyncHandle();
@@ -131,7 +131,7 @@ XRenderFreeGlyphs (Display *dpy,
len = nglyphs;
SetReqLen(req, len, len);
len <<= 2;
- Data32 (dpy, (long *) gids, len);
+ Data32 (dpy, (_Xconst long *) gids, len);
UnlockDisplay(dpy);
SyncHandle();
}
@@ -281,7 +281,7 @@ XRenderCompositeString16 (Display *dpy,
elt->deltay = (INT16) yDst;
xDst = 0;
yDst = 0;
- memcpy ((char *) (elt + 1), (char *) string, MAX_16 * 2);
+ memcpy ((char *) (elt + 1), (_Xconst char *) string, MAX_16 * 2);
nchar = nchar - MAX_16;
string += MAX_16;
}
@@ -293,7 +293,7 @@ XRenderCompositeString16 (Display *dpy,
elt->len = (CARD8) nchar;
elt->deltax = (INT16) xDst;
elt->deltay = (INT16) yDst;
- memcpy ((char *) (elt + 1), (char *) string, (size_t) (nchar * 2));
+ memcpy ((char *) (elt + 1), (_Xconst char *) string, (size_t) (nchar * 2));
}
#undef MAX_16
@@ -361,7 +361,7 @@ XRenderCompositeString32 (Display *dpy,
elt->deltay = (INT16) yDst;
xDst = 0;
yDst = 0;
- memcpy ((char *) (elt + 1), (char *) string, MAX_32 * 4);
+ memcpy ((char *) (elt + 1), (_Xconst char *) string, MAX_32 * 4);
nchar = nchar - MAX_32;
string += MAX_32;
}
@@ -373,7 +373,7 @@ XRenderCompositeString32 (Display *dpy,
elt->len = (CARD8) nchar;
elt->deltax = (INT16) xDst;
elt->deltay = (INT16) yDst;
- memcpy ((char *) (elt + 1), (char *) string, (size_t) (nchar * 4));
+ memcpy ((char *) (elt + 1), (_Xconst char *) string, (size_t) (nchar * 4));
}
#undef MAX_32
diff --git a/src/Picture.c b/src/Picture.c
index a7fff5a..0b0a16c 100644
--- a/src/Picture.c
+++ b/src/Picture.c
@@ -145,7 +145,7 @@ _XRenderSetPictureClipRectangles (Display *dpy,
len = ((long) n) << 1;
SetReqLen (req, len, 1);
len <<= 2;
- Data16 (dpy, (short *) rects, len);
+ Data16 (dpy, (_Xconst short *) rects, len);
}
void
diff --git a/src/Trap.c b/src/Trap.c
index 31ebb95..24f2410 100644
--- a/src/Trap.c
+++ b/src/Trap.c
@@ -65,7 +65,7 @@ XRenderCompositeTrapezoids (Display *dpy,
}
SetReqLen (req, len, len);
len <<= 2;
- DataInt32 (dpy, (int *) traps, len);
+ DataInt32 (dpy, (_Xconst int *) traps, len);
ntrap -= n;
traps += n;
}
diff --git a/src/Tri.c b/src/Tri.c
index ee6824e..b64ad69 100644
--- a/src/Tri.c
+++ b/src/Tri.c
@@ -64,7 +64,7 @@ XRenderCompositeTriangles (Display *dpy,
}
SetReqLen (req, len, len);
len <<= 2;
- DataInt32 (dpy, (int *) triangles, len);
+ DataInt32 (dpy, (_Xconst int *) triangles, len);
ntriangle -= n;
triangles += n;
}
@@ -110,7 +110,7 @@ XRenderCompositeTriStrip (Display *dpy,
}
SetReqLen (req, len, len);
len <<= 2;
- DataInt32 (dpy, (int *) points, len);
+ DataInt32 (dpy, (_Xconst int *) points, len);
npoint -= (n - 2);
points += (n - 2);
}
@@ -163,7 +163,7 @@ XRenderCompositeTriFan (Display *dpy,
}
SetReqLen (req, len, len);
len <<= 2;
- DataInt32 (dpy, (int *) points, len);
+ DataInt32 (dpy, (_Xconst int *) points, len);
npoint -= (n - 1);
points += (n - 1);
}
diff --git a/src/Xrenderint.h b/src/Xrenderint.h
index a17acc7..e424c37 100644
--- a/src/Xrenderint.h
+++ b/src/Xrenderint.h
@@ -106,9 +106,9 @@ XRenderFindDisplay (Display *dpy);
*/
#ifdef WORD64
-#define DataInt32(dpy,d,len) Data32(dpy,(long *) (d),len)
+#define DataInt32(dpy,d,len) Data32(dpy,(_Xconst long *) (d),len)
#else
-#define DataInt32(dpy,d,len) Data(dpy,(char *) (d),len)
+#define DataInt32(dpy,d,len) Data(dpy,(_Xconst char *) (d),len)
#endif
#endif /* _XRENDERINT_H_ */