Changeset 27314 in vbox for trunk

Timestamp:

Mar 12, 2010 8:00:26 AM (15 years ago)

Author:

vboxsync

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

58727

Message:

additions build fix

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• src/VBox/Additions/x11/vboxvideo/vboxutils.c (modified) (2 diffs)

trunk/Config.kmk

@@ -3776 +3776 @@
 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS  = \
         $(VBOX_LIB_VBGL_R3_XFREE86)
-TEMPLATE_VBOXGUESTR3XF86MOD_DEFS  = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR
+TEMPLATE_VBOXGUESTR3XF86MOD_DEFS  = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR VBOX_GUESTR3XF86MOD
 
 
@@ -3788 +3788 @@
 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET)   = $(NO_SUCH_VARIABLE)
 TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS                  = $(TEMPLATE_VBOXGUESTR3DLL_CFLAGS) -std=c99
-TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR
+TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR VBOX_GUESTR3XORGMOD
 ifeq ($(KBUILD_TARGET_ARCH),amd64)
  TEMPLATE_VBOXGUESTR3XORGMOD_DEFS += _XSERVER64

trunk/include/VBox/VBoxGuestLib.h

@@ -435 +435 @@
 VBGLR3DECL(int)     VbglR3SeamlessWaitEvent(VMMDevSeamlessMode *pMode);
 VBGLR3DECL(int)     VbglR3SeamlessSendRects(uint32_t cRects, PRTRECT pRects);
+VBGLR3DECL(int)     VbglR3SeamlessGetLastEvent(VMMDevSeamlessMode *pMode);
+
 /** @}  */
 

trunk/src/VBox/Additions/x11/vboxvideo/vboxutils.c

@@ -1018 +1018 @@
 }
 
+#ifdef VBOX_GUESTR3XORGMOD
+/**
+ * Check if any seamless mode is enabled.
+ * Seamless is only relevant for the newer Xorg modules.
+ *
+ * @returns the result of the query
+ * (true = seamless enabled, false = seamless not enabled)
+ * @param   pScrn  Screen info pointer.
+ */
 Bool
 vboxGuestIsSeamless(ScrnInfoPtr pScrn)
@@ -1030 +1039 @@
     return (mode != VMMDev_Seamless_Disabled);
 }
+#endif
 
 /**