diff options
author | Robert Nagy <robert@cvs.openbsd.org> | 2023-09-06 11:42:38 +0000 |
---|---|---|
committer | Robert Nagy <robert@cvs.openbsd.org> | 2023-09-06 11:42:38 +0000 |
commit | 54294f088cacc8cc2f3b55346aafcb90ffa1a97c (patch) | |
tree | c0cc5f6ae5e9a4eab34a9c3a97fbd6b13e0c0914 /xserver | |
parent | 6f70d6800e1d8b7e5ce9ef5144e25bd4b62a6701 (diff) |
unbreak build with clang-16 by fixing up function definitions to match
our uint64_t is an unsinged long long, but CARD64 is defined as unsigned long
so the function pointer types in both glamor and xf86-video-amdgpu were
mismatched and clang-16 treats that as an error
ok matthieu@
Diffstat (limited to 'xserver')
-rw-r--r-- | xserver/glamor/glamor.h | 2 | ||||
-rw-r--r-- | xserver/glamor/glamor_egl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xserver/glamor/glamor.h b/xserver/glamor/glamor.h index 31157471d..220160cf7 100644 --- a/xserver/glamor/glamor.h +++ b/xserver/glamor/glamor.h @@ -276,7 +276,7 @@ extern _X_EXPORT PixmapPtr glamor_pixmap_from_fds(ScreenPtr screen, const CARD32 *offsets, CARD8 depth, CARD8 bpp, - uint64_t modifier); + CARD64 modifier); /* @glamor_pixmap_from_fd: Creates a pixmap to wrap a dma-buf fd. * diff --git a/xserver/glamor/glamor_egl.c b/xserver/glamor/glamor_egl.c index 8028add63..4832d068a 100644 --- a/xserver/glamor/glamor_egl.c +++ b/xserver/glamor/glamor_egl.c @@ -552,7 +552,7 @@ glamor_pixmap_from_fds(ScreenPtr screen, CARD16 width, CARD16 height, const CARD32 *strides, const CARD32 *offsets, CARD8 depth, CARD8 bpp, - uint64_t modifier) + CARD64 modifier) { PixmapPtr pixmap; struct glamor_egl_screen_private *glamor_egl; |