Commit c529873d authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mihai Moldovan

Lift dbe to xorg-xserver-7.1/1.1.0 state

parent 3d8f8d7a
...@@ -228,7 +228,7 @@ DbeFallbackAllocWinPriv(pScreen) ...@@ -228,7 +228,7 @@ DbeFallbackAllocWinPriv(pScreen)
*****************************************************************************/ *****************************************************************************/
static int static int
DbeAllocWinPrivPrivIndex() DbeAllocWinPrivPrivIndex(void)
{ {
return winPrivPrivCount++; return winPrivPrivCount++;
...@@ -1812,7 +1812,7 @@ DbeDestroyWindow(pWin) ...@@ -1812,7 +1812,7 @@ DbeDestroyWindow(pWin)
*****************************************************************************/ *****************************************************************************/
void void
DbeExtensionInit() DbeExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
register int i, j; register int i, j;
......
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
#include "regionstr.h" #include "regionstr.h"
#include "gcstruct.h" #include "gcstruct.h"
#include "inputstr.h" #include "inputstr.h"
#include "midbe.h"
#include <stdio.h> #include <stdio.h>
...@@ -780,6 +781,11 @@ miDbeResetProc(pScreen) ...@@ -780,6 +781,11 @@ miDbeResetProc(pScreen)
} /* miDbeResetProc() */ } /* miDbeResetProc() */
static void
miDbeNopValidateBuffer(WindowPtr pWin, XID bufId, Bool dstbuffer)
{
}
/****************************************************************************** /******************************************************************************
* *
...@@ -840,7 +846,7 @@ miDbeInit(pScreen, pDbeScreenPriv) ...@@ -840,7 +846,7 @@ miDbeInit(pScreen, pDbeScreenPriv)
pDbeScreenPriv->WinPrivDelete = miDbeWinPrivDelete; pDbeScreenPriv->WinPrivDelete = miDbeWinPrivDelete;
/* The mi implementation doesn't need buffer validation. */ /* The mi implementation doesn't need buffer validation. */
pDbeScreenPriv->ValidateBuffer = (void (*)())NoopDDA; pDbeScreenPriv->ValidateBuffer = miDbeNopValidateBuffer;
return(TRUE); return(TRUE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment