Changeset 11820 in vbox for trunk/include

Timestamp:

Aug 29, 2008 2:09:39 PM (17 years ago)

Author:

vboxsync

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

35651

Message:

made Qt4 the default GUI; VBOX_VRDP => VBOX_WITH_VRDP; VBOX_HGCM => VBOX_WITH_HGCM; Makefile cleanup

Location:

trunk/include

Files:

• Makefile.kmk (modified) (3 diffs)
• VBox/VBoxGuest.h (modified) (7 diffs)
• VBox/VBoxGuestLib.h (modified) (2 diffs)
• VBox/pdmifs.h (modified) (1 diff)

trunk/include/Makefile.kmk

@@ -58 +58 @@
 
 SyntaxVBoxIncludeR3_TEMPLATE = VBOXMAINEXE
-SyntaxVBoxIncludeR3_DEFS = VBOX_HGCM
+SyntaxVBoxIncludeR3_DEFS = VBOX_WITH_HGCM
 SyntaxVBoxIncludeR3_SOURCES := \
         $(addprefix $(PATH_TARGET)/,$(subst .h,-c.c,     $(subst /,_,$(hdrs.r3)))) \
@@ -64 +64 @@
 
 SyntaxVBoxIncludeR0_TEMPLATE = VBOXR0
-SyntaxVBoxIncludeR0_DEFS = VBOX_HGCM
+SyntaxVBoxIncludeR0_DEFS = VBOX_WITH_HGCM
 SyntaxVBoxIncludeR0_SOURCES := \
         $(addprefix $(PATH_TARGET)/,$(subst .h,-c.c,     $(subst /,_,$(hdrs.r0)))) \
@@ -70 +70 @@
 
 SyntaxVBoxIncludeGC_TEMPLATE = VBOXGC
-SyntaxVBoxIncludeGC_DEFS = VBOX_HGCM
+SyntaxVBoxIncludeGC_DEFS = VBOX_WITH_HGCM
 SyntaxVBoxIncludeGC_SOURCES := \
         $(addprefix $(PATH_TARGET)/,$(subst .h,-c.c,     $(subst /,_,$(hdrs.gc)))) \

trunk/include/VBox/VBoxGuest.h

@@ -171 +171 @@
     VMMDevReq_ReportGuestCapabilities    = 55,
     VMMDevReq_SetGuestCapabilities       = 56,
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
     VMMDevReq_HGCMConnect                = 60,
     VMMDevReq_HGCMDisconnect             = 61,
@@ -619 +619 @@
 #pragma pack()
 
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
 
 /** HGCM flags.
@@ -814 +814 @@
 } VMMDevHGCMCancel;
 
-#endif /* VBOX_HGCM */
+#endif /* VBOX_WITH_HGCM */
 
 
@@ -1220 +1220 @@
 
 
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
 /* These structures are shared between the driver and other binaries,
  * therefore packing must be defined explicitely.
@@ -1255 +1255 @@
 # define VBOXGUEST_HGCM_CALL_PARMS(a)       ((HGCMFunctionParameter *)((uint8_t *)(a) + sizeof (VBoxGuestHGCMCallInfo)))
 
-#endif /* VBOX_HGCM */
+#endif /* VBOX_WITH_HGCM */
 
 /*
@@ -1339 +1339 @@
         case VMMDevReq_SetGuestCapabilities:
             return sizeof(VMMDevReqGuestCapabilities2);
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
         case VMMDevReq_HGCMConnect:
             return sizeof(VMMDevHGCMConnect);
@@ -1355 +1355 @@
         case VMMDevReq_HGCMCancel:
             return sizeof(VMMDevHGCMCancel);
-#endif /* VBOX_HGCM */
+#endif /* VBOX_WITH_HGCM */
         case VMMDevReq_VideoAccelEnable:
             return sizeof(VMMDevVideoAccelEnable);

trunk/include/VBox/VBoxGuestLib.h

@@ -132 +132 @@
 /** @} */
 
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
 
 #ifdef VBGL_VBOXGUEST
@@ -245 +245 @@
 #endif /* !VBGL_VBOXGUEST */
 
-#endif /* VBOX_HGCM */
+#endif /* VBOX_WITH_HGCM */
 
 

trunk/include/VBox/pdmifs.h

@@ -2403 +2403 @@
 
 
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
 
 /** Abstract HGCM command structure. Used only to define a typed pointer. */