Changeset 66537 in vbox

Timestamp:

Apr 12, 2017 2:42:47 PM (8 years ago)

Author:

vboxsync

Message:

bugref:8524: Additions/linux: play nicely with distribution-installed Additions
[PATCH] HGSMIChSetup.h: Stop including HGSMI.h

The plan is for the Linux vboxvideo code to stop using the shared HGSMI
code and thus also HGSMI.h, but we do want to keep HGSMIChSetup.h, so
it needs to stop depending on HGSMI.h .

All files including HGSMIChSetup.h but 1, already include HGSMI.h first,
fix that one file and drop the include from HGSMIChSetup.

Signed-off-by: Hans de Goede <hdegoede@…>

Location:

trunk

Files:

• include/VBox/Graphics/HGSMIChSetup.h (modified) (1 diff)
• src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispVBVA.cpp (modified) (1 diff)
• src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp (modified) (1 diff)

trunk/include/VBox/Graphics/HGSMIChSetup.h

@@ -26 +26 @@
 #ifndef ___VBox_Graphics_HGSMIChSetup_h
 #define ___VBox_Graphics_HGSMIChSetup_h
-
-#include <HGSMI.h>
 
 /* HGSMI setup and configuration channel commands and data structures. */

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispVBVA.cpp

@@ -18 +18 @@
 #include "VBoxDisp.h"
 #include "VBoxDispMini.h"
+#include <HGSMI.h>
 #include <HGSMIChSetup.h>
 

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp

@@ -73 +73 @@
 #include "HGSMIHost.h"
 #include <HGSMIChannels.h>
-#include <HGSMIChSetup.h>
 
 #include "../DevVGASavedState.h"