Changeset 1550 in vbox

Timestamp:

Mar 17, 2007 12:36:52 AM (18 years ago)

Author:

vboxsync

Message:

don't include VBoxGuest.h if we don't need to because it drags in ostypes.h and that conflicts with a core darwin type.

Location:

trunk

Files:

• include/VBox/VBoxGuest.h (modified) (1 diff)
• include/VBox/pdm.h (modified) (3 diffs)
• src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxBFE/DisplayImpl.h (modified) (4 diffs)
• src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp (modified) (1 diff)

trunk/include/VBox/VBoxGuest.h

@@ -295 +295 @@
 
 /** guest information structure */
-typedef struct
+typedef struct VBoxGuestInfo
 {
     /** The VMMDev interface version expected by additions. */

trunk/include/VBox/pdm.h

@@ -30 +30 @@
 #include <VBox/err.h>
 #include <VBox/pci.h>
-#include <VBox/VBoxGuest.h>
 
 #include <iprt/critsect.h>
@@ -1659 +1658 @@
 } PDMIVMMDEVPORT;
 
-/** Forward declaration of video accelerator command memory. */
+/** Forward declaration of the video accelerator command memory. */
 struct _VBVAMEMORY;
+/** Forward declaration of the guest information structure. */
+struct VBoxGuestInfo;
 /** Pointer to video accelerator command memory. */
 typedef struct _VBVAMEMORY *PVBVAMEMORY;
@@ -1680 +1681 @@
      * @thread  The emulation thread.
      */
-    DECLR3CALLBACKMEMBER(void, pfnUpdateGuestVersion,(PPDMIVMMDEVCONNECTOR pInterface, VBoxGuestInfo *pGuestInfo));
+    DECLR3CALLBACKMEMBER(void, pfnUpdateGuestVersion,(PPDMIVMMDEVCONNECTOR pInterface, struct VBoxGuestInfo *pGuestInfo));
 
     /**

trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp

@@ -34 +34 @@
 #include <iprt/thread.h>
 #include <VBox/pdm.h>
+#include <VBox/VBoxGuest.h>
 #include <VBox/cfgm.h>
 #include <VBox/err.h>

trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.h

@@ -28 +28 @@
 
 #include "Framebuffer.h"
+struct _VBVACMDHDR;
 
 class VMDisplay
@@ -41 +42 @@
     void handleDisplayUpdate (int x, int y, int cx, int cy);
 
-    int VideoAccelEnable (bool fEnable, VBVAMEMORY *pVbvaMemory);
+    int VideoAccelEnable (bool fEnable, struct _VBVAMEMORY *pVbvaMemory);
     void VideoAccelFlush (void);
     bool VideoAccelAllowed (void);
@@ -84 +85 @@
     RTSEMEVENTMULTI mUpdateSem;
 
-    VBVAMEMORY *mpVbvaMemory;
+    struct _VBVAMEMORY *mpVbvaMemory;
     bool        mfVideoAccelEnabled;
 
-    VBVAMEMORY *mpPendingVbvaMemory;
+    struct _VBVAMEMORY *mpPendingVbvaMemory;
     bool        mfPendingVideoAccelEnable;
     bool        mfMachineRunning;
@@ -94 +95 @@
     uint32_t   mcbVbvaPartial;
 
-    bool vbvaFetchCmd (VBVACMDHDR **ppHdr, uint32_t *pcbCmd);
-    void vbvaReleaseCmd (VBVACMDHDR *pHdr, int32_t cbCmd);
+    bool vbvaFetchCmd (struct _VBVACMDHDR **ppHdr, uint32_t *pcbCmd);
+    void vbvaReleaseCmd (struct _VBVACMDHDR *pHdr, int32_t cbCmd);
 };
 

trunk/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp

@@ -30 +30 @@
 #include <VBox/pdm.h>
 #include <VBox/VBoxDev.h>
+#include <VBox/VBoxGuest.h>
 #include <VBox/cfgm.h>
 #include <VBox/err.h>