Changeset 83207 in vbox

Timestamp:

Mar 5, 2020 1:27:29 PM (5 years ago)

Author:

vboxsync

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

136345

Message:

bugref:9637. Using xinerama includes from our tree instead of the distros includes

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

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

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_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/panoramiXproto.h>
 
 #define OLD_JUNK
-
-#ifndef OLD_JUNK
-#include <X11/extensions/panoramiXproto.h>
-#endif
-
-#ifndef sz_XineramaScreenInfo
-#define sz_XineramaScreenInfo 8
-#endif
 
 /** Maximum number of supported screens.  DRM and X11 both limit this to 32. */