Changeset 67268 in vbox for trunk/src

Timestamp:

Jun 6, 2017 11:54:32 AM (8 years ago)

Author:

vboxsync

Message:

bugref:8524: Additions/linux: play nicely with distribution-installed Additions
[PATCH 1/2] Additions: VboxVideo: Fix compiler warning when building Linux vboxvideo driver
This commit fixes the following compiler warning:

drivers/staging/vboxvideo/osindependent/Modesetting.c: In function ‘VBoxHGSMIGetModeHints’:
drivers/staging/vboxvideo/osindependent/Modesetting.c:346:5: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]

void *p = VBoxHGSMIBufferAlloc(pCtx, sizeof(VBVAQUERYMODEHINTS)
^~

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

File:

• trunk/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp

@@ -341 +341 @@
 {
     int rc;
+    void *p;
+
     AssertPtr(paHints);
     if (!VALID_PTR(paHints))
         return VERR_INVALID_POINTER;
-    void *p = VBoxHGSMIBufferAlloc(pCtx,   sizeof(VBVAQUERYMODEHINTS)
-                                         + cScreens * sizeof(VBVAMODEHINT),
-                                   HGSMI_CH_VBVA, VBVA_QUERY_MODE_HINTS);
+
+    p = VBoxHGSMIBufferAlloc(pCtx, sizeof(VBVAQUERYMODEHINTS)
+                                       + cScreens * sizeof(VBVAMODEHINT),
+                             HGSMI_CH_VBVA, VBVA_QUERY_MODE_HINTS);
     if (!p)
     {