diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2014-01-28 16:07:36 -0800 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2014-01-28 16:07:36 -0800 |
| commit | b4b73056fc8c119beb032d20fc763bc40af3efa9 (patch) | |
| tree | eb9d5cc39cd6a46cf8e335afb4ae82f4ae963c58 /xorg/server/module | |
| parent | 97070b6fd90bcf48da805c42f8e0103831c5752a (diff) | |
| download | xrdp-proprietary-b4b73056fc8c119beb032d20fc763bc40af3efa9.tar.gz xrdp-proprietary-b4b73056fc8c119beb032d20fc763bc40af3efa9.zip | |
xorg: fixes for building with xserver v1.13+
Diffstat (limited to 'xorg/server/module')
| -rw-r--r-- | xorg/server/module/rdpDraw.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/xorg/server/module/rdpDraw.c b/xorg/server/module/rdpDraw.c index ef1edcf3..b4e689af 100644 --- a/xorg/server/module/rdpDraw.c +++ b/xorg/server/module/rdpDraw.c @@ -344,6 +344,8 @@ rdpCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr pOldRegion) rdpRegionUninit(&clip); } +#if XRDP_CLOSESCR == 1 /* before v1.13 */ + /*****************************************************************************/ Bool rdpCloseScreen(int index, ScreenPtr pScreen) @@ -354,15 +356,30 @@ rdpCloseScreen(int index, ScreenPtr pScreen) LLOGLN(0, ("rdpCloseScreen:")); dev = rdpGetDevFromScreen(pScreen); dev->pScreen->CloseScreen = dev->CloseScreen; -#if XRDP_CLOSESCR == 1 /* before v1.13 */ rv = dev->pScreen->CloseScreen(index, pScreen); + dev->pScreen->CloseScreen = rdpCloseScreen; + return rv; +} + #else + +/*****************************************************************************/ +Bool +rdpCloseScreen(ScreenPtr pScreen) +{ + rdpPtr dev; + Bool rv; + + LLOGLN(0, ("rdpCloseScreen:")); + dev = rdpGetDevFromScreen(pScreen); + dev->pScreen->CloseScreen = dev->CloseScreen; rv = dev->pScreen->CloseScreen(pScreen); -#endif dev->pScreen->CloseScreen = rdpCloseScreen; return rv; } +#endif + /******************************************************************************/ WindowPtr rdpGetRootWindowPtr(ScreenPtr pScreen) |