Index: /trunk/src/VBox/Devices/Graphics/DevVGA.cpp
===================================================================
--- /trunk/src/VBox/Devices/Graphics/DevVGA.cpp	(revision 49883)
+++ /trunk/src/VBox/Devices/Graphics/DevVGA.cpp	(revision 49884)
@@ -134,4 +134,5 @@
 #endif
 
+#include "vl_vbox.h"
 #include "VBoxDD.h"
 #include "VBoxDD2.h"
@@ -1174,5 +1175,5 @@
 
 /* called for accesses between 0xa0000 and 0xc0000 */
-static uint32_t vga_mem_readb(PVGASTATE pThis, RTGCPHYS addr, int *prc)
+static uint32_t vga_mem_readb(PVGASTATE pThis, target_phys_addr_t addr, int *prc)
 {
     int memory_map_mode, plane;
@@ -1255,5 +1256,5 @@
 
 /* called for accesses between 0xa0000 and 0xc0000 */
-static int vga_mem_writeb(PVGASTATE pThis, RTGCPHYS addr, uint32_t val)
+static int vga_mem_writeb(PVGASTATE pThis, target_phys_addr_t addr, uint32_t val)
 {
     int memory_map_mode, plane, write_mode, b, func_select, mask;
Index: /trunk/src/VBox/Devices/Graphics/DevVGATmpl.h
===================================================================
--- /trunk/src/VBox/Devices/Graphics/DevVGATmpl.h	(revision 49883)
+++ /trunk/src/VBox/Devices/Graphics/DevVGATmpl.h	(revision 49884)
@@ -56,10 +56,10 @@
 #if DEPTH != 15
 
-static inline void RT_CONCAT(vga_draw_glyph_line_, DEPTH)(uint8_t *d,
-                                                          int font_data,
-                                                          uint32_t xorcol,
-                                                          uint32_t bgcol,
-                                                          int dscan,
-                                                          int linesize)
+static inline void glue(vga_draw_glyph_line_, DEPTH)(uint8_t *d,
+                                                     int font_data,
+                                                     uint32_t xorcol,
+                                                     uint32_t bgcol,
+                                                     int dscan,
+                                                     int linesize)
 {
 #if BPP == 1
@@ -92,7 +92,7 @@
 }
 
-static void RT_CONCAT(vga_draw_glyph8_, DEPTH)(uint8_t *d, int linesize,
-                                               const uint8_t *font_ptr, int h,
-                                               uint32_t fgcol, uint32_t bgcol, int dscan)
+static void glue(vga_draw_glyph8_, DEPTH)(uint8_t *d, int linesize,
+                                          const uint8_t *font_ptr, int h,
+                                          uint32_t fgcol, uint32_t bgcol, int dscan)
 {
     uint32_t xorcol;
@@ -102,5 +102,5 @@
     do {
         font_data = font_ptr[0];
-        RT_CONCAT(vga_draw_glyph_line_, DEPTH)(d, font_data, xorcol, bgcol, dscan, linesize);
+        glue(vga_draw_glyph_line_, DEPTH)(d, font_data, xorcol, bgcol, dscan, linesize);
         font_ptr += 4;
         d += linesize << dscan;
@@ -108,7 +108,7 @@
 }
 
-static void RT_CONCAT(vga_draw_glyph16_, DEPTH)(uint8_t *d, int linesize,
-                                                const uint8_t *font_ptr, int h,
-                                                uint32_t fgcol, uint32_t bgcol, int dscan)
+static void glue(vga_draw_glyph16_, DEPTH)(uint8_t *d, int linesize,
+                                          const uint8_t *font_ptr, int h,
+                                          uint32_t fgcol, uint32_t bgcol, int dscan)
 {
     uint32_t xorcol;
@@ -118,10 +118,10 @@
     do {
         font_data = font_ptr[0];
-        RT_CONCAT(vga_draw_glyph_line_, DEPTH)(d,
-                                               expand4to8[font_data >> 4],
-                                               xorcol, bgcol, dscan, linesize);
-        RT_CONCAT(vga_draw_glyph_line_, DEPTH)(d + 8 * BPP,
-                                               expand4to8[font_data & 0x0f],
-                                               xorcol, bgcol, dscan, linesize);
+        glue(vga_draw_glyph_line_, DEPTH)(d,
+                                          expand4to8[font_data >> 4],
+                                          xorcol, bgcol, dscan, linesize);
+        glue(vga_draw_glyph_line_, DEPTH)(d + 8 * BPP,
+                                          expand4to8[font_data & 0x0f],
+                                          xorcol, bgcol, dscan, linesize);
         font_ptr += 4;
         d += linesize << dscan;
@@ -129,7 +129,7 @@
 }
 
-static void RT_CONCAT(vga_draw_glyph9_, DEPTH)(uint8_t *d, int linesize,
-                                               const uint8_t *font_ptr, int h,
-                                               uint32_t fgcol, uint32_t bgcol, int dup9)
+static void glue(vga_draw_glyph9_, DEPTH)(uint8_t *d, int linesize,
+                                          const uint8_t *font_ptr, int h,
+                                          uint32_t fgcol, uint32_t bgcol, int dup9)
 {
     uint32_t xorcol, v;
@@ -181,6 +181,6 @@
  * 4 color mode
  */
-static void RT_CONCAT(vga_draw_line2_, DEPTH)(VGAState *s1, uint8_t *d,
-                                              const uint8_t *s, int width)
+static void glue(vga_draw_line2_, DEPTH)(VGAState *s1, uint8_t *d,
+                                         const uint8_t *s, int width)
 {
     uint32_t plane_mask, *palette, data, v, src_inc, dwb_mode;
@@ -225,6 +225,6 @@
  * 4 color mode, dup2 horizontal
  */
-static void RT_CONCAT(vga_draw_line2d2_, DEPTH)(VGAState *s1, uint8_t *d,
-                                                const uint8_t *s, int width)
+static void glue(vga_draw_line2d2_, DEPTH)(VGAState *s1, uint8_t *d,
+                                           const uint8_t *s, int width)
 {
     uint32_t plane_mask, *palette, data, v, src_inc, dwb_mode;
@@ -260,6 +260,6 @@
  * 16 color mode
  */
-static void RT_CONCAT(vga_draw_line4_, DEPTH)(VGAState *s1, uint8_t *d,
-                                              const uint8_t *s, int width)
+static void glue(vga_draw_line4_, DEPTH)(VGAState *s1, uint8_t *d,
+                                         const uint8_t *s, int width)
 {
     uint32_t plane_mask, data, v, *palette;
@@ -292,6 +292,6 @@
  * 16 color mode, dup2 horizontal
  */
-static void RT_CONCAT(vga_draw_line4d2_, DEPTH)(VGAState *s1, uint8_t *d,
-                                                const uint8_t *s, int width)
+static void glue(vga_draw_line4d2_, DEPTH)(VGAState *s1, uint8_t *d,
+                                           const uint8_t *s, int width)
 {
     uint32_t plane_mask, data, v, *palette;
@@ -326,6 +326,6 @@
  * XXX: add plane_mask support (never used in standard VGA modes)
  */
-static void RT_CONCAT(vga_draw_line8d2_, DEPTH)(VGAState *s1, uint8_t *d,
-                                                const uint8_t *s, int width)
+static void glue(vga_draw_line8d2_, DEPTH)(VGAState *s1, uint8_t *d,
+                                           const uint8_t *s, int width)
 {
     uint32_t *palette;
@@ -349,6 +349,6 @@
  * XXX: add plane_mask support (never used in standard VGA modes)
  */
-static void RT_CONCAT(vga_draw_line8_, DEPTH)(VGAState *s1, uint8_t *d,
-                                              const uint8_t *s, int width)
+static void glue(vga_draw_line8_, DEPTH)(VGAState *s1, uint8_t *d,
+                                         const uint8_t *s, int width)
 {
     uint32_t *palette;
@@ -379,6 +379,6 @@
  * 15 bit color
  */
-static void RT_CONCAT(vga_draw_line15_, DEPTH)(VGAState *s1, uint8_t *d,
-                                               const uint8_t *s, int width)
+static void glue(vga_draw_line15_, DEPTH)(VGAState *s1, uint8_t *d,
+                                          const uint8_t *s, int width)
 {
 #if DEPTH == 15 && defined(WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)
@@ -394,5 +394,5 @@
         g = (v >> 2) & 0xf8;
         b = (v << 3) & 0xf8;
-        ((PIXEL_TYPE *)d)[0] = RT_CONCAT(rgb_to_pixel, DEPTH)(r, g, b);
+        ((PIXEL_TYPE *)d)[0] = glue(rgb_to_pixel, DEPTH)(r, g, b);
         s += 2;
         d += BPP;
@@ -405,6 +405,6 @@
  * 16 bit color
  */
-static void RT_CONCAT(vga_draw_line16_, DEPTH)(VGAState *s1, uint8_t *d,
-                                               const uint8_t *s, int width)
+static void glue(vga_draw_line16_, DEPTH)(VGAState *s1, uint8_t *d,
+                                          const uint8_t *s, int width)
 {
 #if DEPTH == 16 && defined(WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)
@@ -420,5 +420,5 @@
         g = (v >> 3) & 0xfc;
         b = (v << 3) & 0xf8;
-        ((PIXEL_TYPE *)d)[0] = RT_CONCAT(rgb_to_pixel, DEPTH)(r, g, b);
+        ((PIXEL_TYPE *)d)[0] = glue(rgb_to_pixel, DEPTH)(r, g, b);
         s += 2;
         d += BPP;
@@ -431,6 +431,6 @@
  * 24 bit color
  */
-static void RT_CONCAT(vga_draw_line24_, DEPTH)(VGAState *s1, uint8_t *d,
-                                               const uint8_t *s, int width)
+static void glue(vga_draw_line24_, DEPTH)(VGAState *s1, uint8_t *d,
+                                          const uint8_t *s, int width)
 {
     int w;
@@ -449,5 +449,5 @@
         r = s[2];
 #endif
-        ((PIXEL_TYPE *)d)[0] = RT_CONCAT(rgb_to_pixel, DEPTH)(r, g, b);
+        ((PIXEL_TYPE *)d)[0] = glue(rgb_to_pixel, DEPTH)(r, g, b);
         s += 3;
         d += BPP;
@@ -458,6 +458,6 @@
  * 32 bit color
  */
-static void RT_CONCAT(vga_draw_line32_, DEPTH)(VGAState *s1, uint8_t *d,
-                                               const uint8_t *s, int width)
+static void glue(vga_draw_line32_, DEPTH)(VGAState *s1, uint8_t *d,
+                                          const uint8_t *s, int width)
 {
 #if DEPTH == 32 && defined(WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)
@@ -478,5 +478,5 @@
         r = s[2];
 #endif
-        ((PIXEL_TYPE *)d)[0] = RT_CONCAT(rgb_to_pixel, DEPTH)(r, g, b);
+        ((PIXEL_TYPE *)d)[0] = glue(rgb_to_pixel, DEPTH)(r, g, b);
         s += 4;
         d += BPP;
@@ -491,10 +491,10 @@
 static
 #endif/* VBOX */
-void RT_CONCAT(vga_draw_cursor_line_, DEPTH)(uint8_t *d1,
-                                             const uint8_t *src1,
-                                             int poffset, int w,
-                                             unsigned int color0,
-                                             unsigned int color1,
-                                             unsigned int color_xor)
+void glue(vga_draw_cursor_line_, DEPTH)(uint8_t *d1,
+                                        const uint8_t *src1,
+                                        int poffset, int w,
+                                        unsigned int color0,
+                                        unsigned int color1,
+                                        unsigned int color_xor)
 {
     const uint8_t *plane0, *plane1;