diff options
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/dummy_driver.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 2d96988..810063b 100644 --- a/configure.ac +++ b/configure.ac @@ -56,7 +56,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(RENDER, renderproto) # Obtain compiler/linker options for the driver dependencies -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4.99.901] xproto fontsproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.18] xproto fontsproto $REQUIRED_MODULES) # Checks for libraries. diff --git a/src/dummy_driver.c b/src/dummy_driver.c index d2fdc1d..07e49f2 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -1027,11 +1027,8 @@ DUMMYCreateWindow(WindowPtr pWin) return(ret); if(dPtr->prop == FALSE) { -#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 8 - pWinRoot = WindowTable[DUMMYScrn->pScreen->myNum]; -#else pWinRoot = DUMMYScrn->pScreen->root; -#endif + if (! ValidAtom(VFB_PROP)) VFB_PROP = MakeAtom(VFB_PROP_NAME, strlen(VFB_PROP_NAME), 1); |