diff options
| author | Priit Laes <plaes@plaes.org> | 2010-12-12 16:17:24 +0200 |
|---|---|---|
| committer | Martin-Éric Racine <martin-eric.racine@iki.fi> | 2010-12-12 17:17:13 +0200 |
| commit | 5873bfa48f1c090d224adbc7ca7df3ebea0b198f (patch) | |
| tree | 960deca037b763fada233779d6d6815384926ee0 | |
| parent | 1d8d02d64e9f5d5dd3788b3b9b1b25866c2ed6b5 (diff) | |
Fix compilation under xorg >1.9.99
Signed-off-by: Priit Laes <plaes@plaes.org>
| -rw-r--r-- | src/gx_randr.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/gx_randr.c b/src/gx_randr.c index 1593c97..345eaa5 100644 --- a/src/gx_randr.c +++ b/src/gx_randr.c @@ -26,7 +26,12 @@ * software without specific prior written permission. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "xf86.h" +#include "xf86Modes.h" #include "os.h" #include "globals.h" #include "xf86.h" @@ -171,7 +176,9 @@ GXRandRSetMode(ScreenPtr pScreen, #endif DisplayModePtr currentMode = NULL; Bool ret = TRUE; +#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,9,99,1,0) PixmapPtr pspix = NULL; + #endif if (pRoot) (*pScrni->EnableDisableFBAccess) (pScreen->myNum, FALSE); @@ -210,16 +217,16 @@ GXRandRSetMode(ScreenPtr pScreen, pScrni->currentMode = currentMode; } +#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,9,99,1,0) /* * Get the new Screen pixmap ptr as SwitchMode might have called * ModifyPixmapHeader and xf86EnableDisableFBAccess will put it back... * Unfortunately. - */ - pspix = (*pScreen->GetScreenPixmap) (pScreen); if (pspix->devPrivate.ptr) pScrni->pixmapPrivate = pspix->devPrivate; +#endif xf86ReconfigureLayout(); |