Revert previous:

unbreak build with clang-16 by fixing up function definitions to match
the whole CARD64 vs uint64_t issue needs more thinking.
Suggested by kettenis@

2 files changed, 2 insertions, 2 deletions

diff --git a/xserver/glamor/glamor.h b/xserver/glamor/glamor.h
index 220160cf7..31157471d 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,
-                                                  CARD64 modifier);
+                                                  uint64_t 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 4832d068a..8028add63 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,
-                       CARD64 modifier)
+                       uint64_t modifier)
 {
     PixmapPtr pixmap;
     struct glamor_egl_screen_private *glamor_egl;