From c529873d9e7265634fd5223e727f58eb2d0c1a27 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 5 Nov 2017 22:00:44 +0100 Subject: Lift dbe to xorg-xserver-7.1/1.1.0 state --- nx-X11/programs/Xserver/dbe/dbe.c | 4 ++-- nx-X11/programs/Xserver/dbe/midbe.c | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'nx-X11') diff --git a/nx-X11/programs/Xserver/dbe/dbe.c b/nx-X11/programs/Xserver/dbe/dbe.c index 85a22219f..0860801dd 100644 --- a/nx-X11/programs/Xserver/dbe/dbe.c +++ b/nx-X11/programs/Xserver/dbe/dbe.c @@ -228,7 +228,7 @@ DbeFallbackAllocWinPriv(pScreen) *****************************************************************************/ static int -DbeAllocWinPrivPrivIndex() +DbeAllocWinPrivPrivIndex(void) { return winPrivPrivCount++; @@ -1812,7 +1812,7 @@ DbeDestroyWindow(pWin) *****************************************************************************/ void -DbeExtensionInit() +DbeExtensionInit(void) { ExtensionEntry *extEntry; register int i, j; diff --git a/nx-X11/programs/Xserver/dbe/midbe.c b/nx-X11/programs/Xserver/dbe/midbe.c index e241e5f28..b0054201c 100644 --- a/nx-X11/programs/Xserver/dbe/midbe.c +++ b/nx-X11/programs/Xserver/dbe/midbe.c @@ -53,6 +53,7 @@ #include "regionstr.h" #include "gcstruct.h" #include "inputstr.h" +#include "midbe.h" #include @@ -780,6 +781,11 @@ miDbeResetProc(pScreen) } /* miDbeResetProc() */ +static void +miDbeNopValidateBuffer(WindowPtr pWin, XID bufId, Bool dstbuffer) +{ +} + /****************************************************************************** * @@ -840,7 +846,7 @@ miDbeInit(pScreen, pDbeScreenPriv) pDbeScreenPriv->WinPrivDelete = miDbeWinPrivDelete; /* The mi implementation doesn't need buffer validation. */ - pDbeScreenPriv->ValidateBuffer = (void (*)())NoopDDA; + pDbeScreenPriv->ValidateBuffer = miDbeNopValidateBuffer; return(TRUE); -- cgit v1.2.3