From 5d9ce0a05319513dbeb57a839b59a2e5e66c7d51 Mon Sep 17 00:00:00 2001 From: purplerain Date: Wed, 6 Sep 2023 19:06:36 +0000 Subject: [PATCH] sync code with last improvements from OpenBSD --- app/xlockmore/xlock/logout.c | 3 --- driver/xf86-video-amdgpu/src/amdgpu_present.c | 2 +- driver/xf86-video-amdgpu/src/drmmode_display.h | 2 +- lib/libGLU/src/libnurbs/internals/varray.cc | 4 ++-- xserver/glamor/glamor.h | 2 +- xserver/glamor/glamor_egl.c | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/xlockmore/xlock/logout.c b/app/xlockmore/xlock/logout.c index f16f4c36..3906533b 100644 --- a/app/xlockmore/xlock/logout.c +++ b/app/xlockmore/xlock/logout.c @@ -40,10 +40,7 @@ static const char sccsid[] = "@(#)logout.c 4.02 97/04/01 xlockmore"; #if ( HAVE_SYSLOG_H && defined( USE_SYSLOG )) #include #endif -#if defined(__CYGWIN__) || defined(SOLARIS2) #include -#endif -#include extern Bool inroot, inwindow, nolock, debug; extern char *logoutCmd; diff --git a/driver/xf86-video-amdgpu/src/amdgpu_present.c b/driver/xf86-video-amdgpu/src/amdgpu_present.c index ca905d13..6c19867c 100644 --- a/driver/xf86-video-amdgpu/src/amdgpu_present.c +++ b/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, CARD64 *ust, CARD64 *msc) +amdgpu_present_get_ust_msc(RRCrtcPtr crtc, uint64_t *ust, uint64_t *msc) { xf86CrtcPtr xf86_crtc = crtc->devPrivate; drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private; diff --git a/driver/xf86-video-amdgpu/src/drmmode_display.h b/driver/xf86-video-amdgpu/src/drmmode_display.h index 634b897d..023a384f 100644 --- a/driver/xf86-video-amdgpu/src/drmmode_display.h +++ b/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, CARD64 *ust, CARD64 *msc); +int drmmode_crtc_get_ust_msc(xf86CrtcPtr crtc, uint64_t *ust, uint64_t *msc); int drmmode_get_current_ust(int drm_fd, CARD64 * ust); void drmmode_crtc_set_vrr(xf86CrtcPtr crtc, Bool enabled); diff --git a/lib/libGLU/src/libnurbs/internals/varray.cc b/lib/libGLU/src/libnurbs/internals/varray.cc index 1cb23544..41b3b183 100644 --- a/lib/libGLU/src/libnurbs/internals/varray.cc +++ b/lib/libGLU/src/libnurbs/internals/varray.cc @@ -73,8 +73,8 @@ Varray::~Varray( void ) inline void Varray::update( Arc_ptr arc, long dir[2], REAL val ) { - register long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]); - register long dt = sgn(arc->tail()[1] - arc->prev->tail()[1]); + long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]); + long dt = sgn(arc->tail()[1] - arc->prev->tail()[1]); if( dir[0] != ds || dir[1] != dt ) { dir[0] = ds; diff --git a/xserver/glamor/glamor.h b/xserver/glamor/glamor.h index 31157471..220160cf 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 8028add6..4832d068 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;