Changeset 63480 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA.cpp

Timestamp:

Aug 15, 2016 2:17:54 PM (8 years ago)

Author:

vboxsync

Message:

Devices: warnings (clang)

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -340 +340 @@
 }
 
+#ifdef IN_RING3
 /**
  * Reset dirty flags in a give range.
@@ -354 +355 @@
     ASMBitClearRange(&pThis->au32DirtyBitmap[0], offVRAMStart >> PAGE_SHIFT, offVRAMEnd >> PAGE_SHIFT);
 }
+#endif /* IN_RING3 */
 
 #ifdef _MSC_VER
@@ -447 +449 @@
 #endif
 
+#ifdef IN_RING3
+
 static const uint32_t dmask16[16] = {
     PAT(0x00000000),
@@ -473 +477 @@
 };
 
-#if defined(IN_RING3)
 static uint32_t expand4[256];
 static uint16_t expand2[256];
 static uint8_t expand4to8[16];
+
 #endif /* IN_RING3 */
 
@@ -1518 +1522 @@
 }
 
-#if defined(IN_RING3)
+#ifdef IN_RING3
+
 typedef void vga_draw_glyph8_func(uint8_t *d, int linesize,
                                   const uint8_t *font_ptr, int h,
@@ -2152 +2157 @@
 }
 
-#ifdef VBOX_WITH_VMSVGA
+# ifdef VBOX_WITH_VMSVGA
+
 int vgaR3UpdateDisplay(VGAState *s, unsigned xStart, unsigned yStart, unsigned cx, unsigned cy)
 {
@@ -2332 +2338 @@
     return VINF_SUCCESS;
 }
-#endif /* VBOX_WITH_VMSVGA */
+
+# endif /* VBOX_WITH_VMSVGA */
 
 /*