Changeset 58659 in vbox for trunk/src/VBox/Additions

Timestamp:

Nov 11, 2015 12:25:21 PM (9 years ago)

Author:

vboxsync

Message:

Additions/x11: warning clean-up in X.Org headers to support server provided file descriptors. In this model the display manager opens the kernel drm device and passes the file descriptor to the server and the server driver.

Location:

trunk/src/VBox/Additions/x11/x11include/xorg-server-1.18.0

Files:

• README (modified) (1 diff)
• xf86platformBus.h (modified) (2 diffs)

trunk/src/VBox/Additions/x11/x11include/xorg-server-1.18.0/README

@@ -17 +17 @@
 edid-new.h \
 ${PATH_VBOX}/src/VBox/Additions/x11/x11include/xorg-server-1.18.0/edid.h
+sed 's/\(fake.*\)\[0\]/\1\[1\]/g' \
+    ${PATH_VBOX}/src/VBox/Additions/x11/x11include/xorg-server-1.18.0/\
+xf86platformBus.h \
+    > ${PATH_VBOX}/src/VBox/Additions/x11/x11include/xorg-server-1.18.0/\
+xf86platformBus-new.h
+mv ${PATH_VBOX}/src/VBox/Additions/x11/x11include/xorg-server-1.18.0/\
+xf86platformBus-new.h \
+${PATH_VBOX}/src/VBox/Additions/x11/x11include/xorg-server-1.18.0/\
+xf86platformBus.h

trunk/src/VBox/Additions/x11/x11include/xorg-server-1.18.0/xf86platformBus.h

@@ -105 +105 @@
 
 static inline char *
-_xf86_get_platform_device_attrib(struct xf86_platform_device *device, int attrib, int (*fake)[0])
+_xf86_get_platform_device_attrib(struct xf86_platform_device *device, int attrib, int (*fake)[1])
 {
     switch (attrib) {
@@ -130 +130 @@
 
 static inline int
-_xf86_get_platform_device_int_attrib(struct xf86_platform_device *device, int attrib, int (*fake)[0])
+_xf86_get_platform_device_int_attrib(struct xf86_platform_device *device, int attrib, int (*fake)[1])
 {
     switch (attrib) {