The screen index was removed in 1.13, not 1.12.
Bug found and patched by Koichiro IWAO.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5130 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/unix/xserver/hw/vnc/vncHooks.cc b/unix/xserver/hw/vnc/vncHooks.cc
index 426c29f..6756da7 100644
--- a/unix/xserver/hw/vnc/vncHooks.cc
+++ b/unix/xserver/hw/vnc/vncHooks.cc
@@ -119,7 +119,7 @@
// screen functions
-#if XORG < 112
+#if XORG <= 112
static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen);
#else
static Bool vncHooksCloseScreen(ScreenPtr pScreen);
@@ -140,7 +140,7 @@
DeviceIntPtr pDev,
#endif
ScreenPtr pScreen, CursorPtr cursor);
-#if XORG < 112
+#if XORG <= 112
static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
pointer pReadmask);
#else
@@ -367,7 +367,7 @@
// CloseScreen - unwrap the screen functions and call the original CloseScreen
// function
-#if XORG < 112
+#if XORG <= 112
static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen_)
#else
static Bool vncHooksCloseScreen(ScreenPtr pScreen_)
@@ -405,7 +405,7 @@
DBGPRINT((stderr,"vncHooksCloseScreen: unwrapped screen functions\n"));
-#if XORG < 112
+#if XORG <= 112
return (*pScreen->CloseScreen)(i, pScreen);
#else
return (*pScreen->CloseScreen)(pScreen);
@@ -574,7 +574,7 @@
// BlockHandler - ignore any changes during the block handler - it's likely
// these are just drawing the cursor.
-#if XORG < 112
+#if XORG <= 112
static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
pointer pReadmask)
#else
@@ -582,7 +582,7 @@
pointer pReadmask)
#endif
{
-#if XORG < 112
+#if XORG <= 112
SCREEN_UNWRAP(screenInfo.screens[i], BlockHandler);
#else
SCREEN_UNWRAP(pScreen_, BlockHandler);
@@ -590,7 +590,7 @@
vncHooksScreen->desktop->ignoreHooks(true);
-#if XORG < 112
+#if XORG <= 112
(*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
#else
(*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);