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@

driver/xf86-video-amdgpu/src/amdgpu_present.c

@@ -62,7 +62,7 @@ amdgpu_present_get_crtc(WindowPtr window)
 }
 
 static int
-amdgpu_present_get_ust_msc(RRCrtcPtr crtc, uint64_t *ust, uint64_t *msc)
+amdgpu_present_get_ust_msc(RRCrtcPtr crtc, CARD64 *ust, CARD64 *msc)
 {
 	xf86CrtcPtr xf86_crtc = crtc->devPrivate;
 	drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private;

driver/xf86-video-amdgpu/src/drmmode_display.h

@@ -284,7 +284,7 @@ Bool amdgpu_do_pageflip(ScrnInfoPtr scrn, ClientPtr client,
 			amdgpu_drm_abort_proc abort,
 			enum drmmode_flip_sync flip_sync,
 			uint32_t target_msc);
-int drmmode_crtc_get_ust_msc(xf86CrtcPtr crtc, uint64_t *ust, uint64_t *msc);
+int drmmode_crtc_get_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc);
 int drmmode_get_current_ust(int drm_fd, CARD64 * ust);
 void drmmode_crtc_set_vrr(xf86CrtcPtr crtc, Bool enabled);
 

proto/xorgproto/include/X11/Xmd.h

@@ -57,8 +57,6 @@ SOFTWARE.
 #  include <sys/isa_defs.h> /* Solaris: defines _LP64 if necessary */
 # endif
 
-#include <stdint.h>
-
 #if defined(__SIZEOF_LONG__)
 # if __SIZEOF_LONG__ == 8
 #  define LONG64				/* 32/64-bit architecture */
@@ -109,10 +107,15 @@ typedef short INT16;
 
 typedef signed char    INT8;
 
-typedef uint64_t CARD64;
-typedef uint32_t CARD32;
-typedef uint16_t CARD16;
-typedef uint8_t  CARD8;
+# ifdef LONG64
+typedef unsigned long CARD64;
+typedef unsigned int CARD32;
+# else
+typedef unsigned long long CARD64;
+typedef unsigned long CARD32;
+# endif
+typedef unsigned short CARD16;
+typedef unsigned char  CARD8;
 
 typedef CARD32		BITS32;
 typedef CARD16		BITS16;

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.
  *

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;