SecBSD/xenocara
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync code with last improvements from OpenBSD

Browse source
This commit is contained in:
purplerain 2023-09-06 19:06:36 +00:00
parent c6dfd6da0e
commit 5d9ce0a053
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
6 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/xlockmore/xlock/logout.c
View file

@ -40,10 +40,7 @@ static const char sccsid[] = "@(#)logout.c 4.02 97/04/01 xlockmore";
#if ( HAVE_SYSLOG_H && defined( USE_SYSLOG )) #if ( HAVE_SYSLOG_H && defined( USE_SYSLOG ))
#include <syslog.h> #include <syslog.h>
#endif #endif
#if defined(__CYGWIN__) || defined(SOLARIS2)
#include <signal.h> #include <signal.h>
#endif
#include <sys/signal.h>
extern Bool inroot, inwindow, nolock, debug; extern Bool inroot, inwindow, nolock, debug;
extern char *logoutCmd; extern char *logoutCmd;

2
driver/xf86-video-amdgpu/src/amdgpu_present.c
View file

@ -62,7 +62,7 @@ amdgpu_present_get_crtc(WindowPtr window)
} }
static int 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; xf86CrtcPtr xf86_crtc = crtc->devPrivate;
drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private; drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private;

2
driver/xf86-video-amdgpu/src/drmmode_display.h
View file

@ -284,7 +284,7 @@ Bool amdgpu_do_pageflip(ScrnInfoPtr scrn, ClientPtr client,
amdgpu_drm_abort_proc abort, amdgpu_drm_abort_proc abort,
enum drmmode_flip_sync flip_sync, enum drmmode_flip_sync flip_sync,
uint32_t target_msc); 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); int drmmode_get_current_ust(int drm_fd, CARD64 * ust);
void drmmode_crtc_set_vrr(xf86CrtcPtr crtc, Bool enabled); void drmmode_crtc_set_vrr(xf86CrtcPtr crtc, Bool enabled);

4
lib/libGLU/src/libnurbs/internals/varray.cc
View file

@ -73,8 +73,8 @@ Varray::~Varray( void )
inline void inline void
Varray::update( Arc_ptr arc, long dir[2], REAL val ) Varray::update( Arc_ptr arc, long dir[2], REAL val )
{ {
register long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]); long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]);
register long dt = sgn(arc->tail()[1] - arc->prev->tail()[1]); long dt = sgn(arc->tail()[1] - arc->prev->tail()[1]);
if( dir[0] != ds || dir[1] != dt ) { if( dir[0] != ds || dir[1] != dt ) {
dir[0] = ds; dir[0] = ds;

2
xserver/glamor/glamor.h
View file

@ -276,7 +276,7 @@ extern _X_EXPORT PixmapPtr glamor_pixmap_from_fds(ScreenPtr screen,
const CARD32 *offsets, const CARD32 *offsets,
CARD8 depth, CARD8 depth,
CARD8 bpp, CARD8 bpp,
uint64_t modifier); CARD64 modifier);
/* @glamor_pixmap_from_fd: Creates a pixmap to wrap a dma-buf fd. /* @glamor_pixmap_from_fd: Creates a pixmap to wrap a dma-buf fd.
* *

2
xserver/glamor/glamor_egl.c
View file

@ -552,7 +552,7 @@ glamor_pixmap_from_fds(ScreenPtr screen,
CARD16 width, CARD16 height, CARD16 width, CARD16 height,
const CARD32 *strides, const CARD32 *offsets, const CARD32 *strides, const CARD32 *offsets,
CARD8 depth, CARD8 bpp, CARD8 depth, CARD8 bpp,
uint64_t modifier) CARD64 modifier)
{ {
PixmapPtr pixmap; PixmapPtr pixmap;
struct glamor_egl_screen_private *glamor_egl; struct glamor_egl_screen_private *glamor_egl;