aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-11-05 22:00:44 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-26 06:09:38 +0100
commitc529873d9e7265634fd5223e727f58eb2d0c1a27 (patch)
treea5a826b0e8bad9cc0dd9d9b735a8394a5da15bd0 /nx-X11
parent3d8f8d7ab27ee116a28aa7fc07adfb6f314571a6 (diff)
downloadnx-libs-c529873d9e7265634fd5223e727f58eb2d0c1a27.tar.gz
nx-libs-c529873d9e7265634fd5223e727f58eb2d0c1a27.tar.bz2
nx-libs-c529873d9e7265634fd5223e727f58eb2d0c1a27.zip
Lift dbe to xorg-xserver-7.1/1.1.0 state
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/dbe/dbe.c4
-rw-r--r--nx-X11/programs/Xserver/dbe/midbe.c8
2 files changed, 9 insertions, 3 deletions
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 <stdio.h>
@@ -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);