Changeset 69082 in vbox for trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

Timestamp:

Oct 13, 2017 3:50:47 PM (7 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: Add support for the X.Org Server 1.19 ABI.
bugref:9017: Additions/x11: put vboxvideo into upstream X.Org

File:

• trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c (modified) (2 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

@@ -1061 +1061 @@
  * Although this is far more often than necessary it should not have real-life
  * performance consequences and allows us to simplify the code quite a bit. */
-static void vboxBlockHandler(pointer pData, OSTimePtr pTimeout, pointer pReadmask)
+static void vboxBlockHandler(pointer pData,
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 23
+                             OSTimePtr pTimeout,
+                             pointer pReadmask
+#else
+                             void *pTimeout
+#endif
+                  )
 {
     ScrnInfoPtr pScrn = (ScrnInfoPtr)pData;
     Bool fNeedUpdate = false;
 
-    (void)pTimeout;
-    (void)pReadmask;
+    RT_NOREF(pTimeout);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 23
+    RT_NOREF(pReadmask);
+#endif
     if (pScrn->vtSema)
         vbvxReadSizesAndCursorIntegrationFromHGSMI(pScrn, &fNeedUpdate);
@@ -1224 +1233 @@
     updateGraphicsCapability(pScrn, TRUE);
 
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 23
+# define WakeupHandlerProcPtr ServerWakeupHandlerProcPtr
+#endif
+
     /* Register block and wake-up handlers for getting new screen size hints. */
     RegisterBlockAndWakeupHandlers(vboxBlockHandler, (WakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);