Changeset 83210 in vbox

Timestamp:

Mar 5, 2020 2:35:19 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

136348

Message:

bugref:9637. We need panoramiXproto.h rather than Xinerama.h

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• Makefile.kmk (modified) (1 diff)
• display-svga-x11.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

@@ -32 +32 @@
 VBoxClient_DEFS.linux += _GNU_SOURCE
 VBoxClient_INCS = $(VBOX_GRAPHICS_INCS)
-VBoxClient_INCS += ../x11include/libxinerama-1.1.4
+VBoxClient_INCS += ../x11include/panoramiXproto-1.1
 VBoxClient_SOURCES = \
         main.cpp \

trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

@@ -51 +51 @@
 #include <X11/Xlibint.h>
 #include <X11/extensions/Xrandr.h>
-#include <X11/extensions/Xinerama.h>
+#include <X11/extensions/panoramiXproto.h>
 
 #define OLD_JUNK
@@ -140 +140 @@
 
 
-#ifndef OLD_JUNK
-
 bool VMwareCtrlSetTopology(Display *dpy, int hExtensionMajorOpcode,
                             int screen, xXineramaScreenInfo extents[], int number)
@@ -176 +174 @@
 }
 
+#ifndef OLD_JUNK
 /** This function assumes monitors are named as from Virtual1 to VirtualX. */
 static int getMonitorIdFromName(const char *sMonitorName)