diff options
| author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-03-11 11:01:02 +0100 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-04-15 19:00:47 -0700 |
| commit | 85d4bd0dba6ac5adb73864396d260be92a23ea50 (patch) | |
| tree | 96ce7323e0fda4afacb23c2ca55d5156e21c1c5d /render | |
| parent | 1ca48d0a48dbec38d2765d8626f7983751226966 (diff) | |
rename remaining RT_* defines to X11_RESTYPE_*
Since we already had to rename some of them, in order to fix name clashes
on win32, it's now time to rename all the remaining ones.
The old ones are still present as define's to the new ones, just for
backwards compatibility.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1355>
Diffstat (limited to 'render')
| -rw-r--r-- | render/picture.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/render/picture.c b/render/picture.c index 6f139b520..45498b093 100644 --- a/render/picture.c +++ b/render/picture.c @@ -422,7 +422,7 @@ PictureInitIndexedFormat(ScreenPtr pScreen, PictFormatPtr format) if (format->index.vid == pScreen->rootVisual) { dixLookupResourceByType((void **) &format->index.pColormap, - pScreen->defColormap, RT_COLORMAP, + pScreen->defColormap, X11_RESTYPE_COLORMAP, serverClient, DixGetAttrAccess); } else { @@ -590,7 +590,7 @@ GetPictureBytes(void *value, XID id, ResourceSizePtr size) size->pixmapRefSize = 0; if (picture->pDrawable && (picture->pDrawable->type == DRAWABLE_PIXMAP)) { - SizeType pixmapSizeFunc = GetResourceTypeSizeFunc(RT_PIXMAP); + SizeType pixmapSizeFunc = GetResourceTypeSizeFunc(X11_RESTYPE_PIXMAP); ResourceSizeRec pixmapSize = { 0, 0, 0 }; PixmapPtr pixmap = (PixmapPtr)picture->pDrawable; pixmapSizeFunc(pixmap, pixmap->drawable.id, &pixmapSize); @@ -761,7 +761,7 @@ CreatePicture(Picture pid, /* security creation/labeling check */ *error = XaceHook(XACE_RESOURCE_ACCESS, client, pid, PictureType, pPicture, - RT_PIXMAP, pDrawable, DixCreateAccess | DixSetAttrAccess); + X11_RESTYPE_PIXMAP, pDrawable, DixCreateAccess | DixSetAttrAccess); if (*error != Success) goto out; @@ -1028,7 +1028,7 @@ cpClipMask(void **result, XID id, ScreenPtr screen, ClientPtr client, Mask mode) id = res->info[screen->myNum].id; } #endif - return dixLookupResourceByType(result, id, RT_PIXMAP, client, mode); + return dixLookupResourceByType(result, id, X11_RESTYPE_PIXMAP, client, mode); } #define NEXT_VAL(_type) (vlist ? (_type) *vlist++ : (_type) ulist++->val) |