Changeset 67459 in vbox for trunk/src/VBox/Additions/linux/drm

Timestamp:

Jun 19, 2017 9:21:10 AM (8 years ago)

Author:

vboxsync

Message:

bugref:8524: Additions/linux: play nicely with distribution-installed Additions
Do not define HGSMISIZE and HGSMIOFFSET in VBoxVideoIPRT.h

These were defined in both src/VBox/Additions/linux/drm/VBoxVideoIPRT.h and
in include/VBox/Graphics/HGSMIDefs.h, causing a build failure on OL 6.9.
Fix that and include HGSMIDefs.h earlier in src/VBox/Additions/linux/drm/
HGSMIBase.h to make sure that the definitions are available when they are
needed.
Either other environments are less fussy about this or I must have done my
testing wrong, since I did not notice this up until now.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• HGSMIBase.h (modified) (1 diff)
• VBoxVideoIPRT.h (modified) (1 diff)

trunk/src/VBox/Additions/linux/drm/HGSMIBase.h

@@ -29 +29 @@
 
 #include <VBoxVideoIPRT.h>
+#include <HGSMIDefs.h>
 #include <HGSMIChannels.h>
 #include <HGSMIChSetup.h>
-#include <HGSMIDefs.h>
 #include <linux/genalloc.h>
 

trunk/src/VBox/Additions/linux/drm/VBoxVideoIPRT.h

@@ -109 +109 @@
  * @{ */
 
-/* HGSMI uses 32 bit offsets and sizes. */
-typedef uint32_t HGSMISIZE;
-typedef uint32_t HGSMIOFFSET;
-
 typedef void RTRECT;