[Bochs-cvs] CVS: bochs/gui beos.cc, 1.35, 1.36 win32.cc, 1.135, 1.136 x.cc, 1.128, 1.129

[Stanislav S. <ssh...@us...>]

Update of /cvsroot/bochs/bochs/gui
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27676

Modified Files:
	beos.cc win32.cc x.cc 
Log Message:
fixed gcc4 warnings


Index: beos.cc
===================================================================
RCS file: /cvsroot/bochs/bochs/gui/beos.cc,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- beos.cc	4 Dec 2009 20:02:12 -0000	1.35
+++ beos.cc	24 Jan 2010 12:46:41 -0000	1.36
@@ -168,12 +168,12 @@
 
 static unsigned x_tilesize, y_tilesize;
 
-struct {
+static struct {
   BBitmap *bmap;
   unsigned xdim;
   unsigned ydim;
 } bx_bitmaps[BX_MAX_PIXMAPS];
-unsigned bx_bitmap_entries = 0;
+static unsigned bx_bitmap_entries = 0;
 
 static struct {
   BBitmap   *bitmap;
@@ -183,7 +183,8 @@
   unsigned yorigin;
   unsigned alignment;
   void (*f)(void);
-  } bx_headerbar_entry[BX_MAX_HEADERBAR_ENTRIES];
+} bx_headerbar_entry[BX_MAX_HEADERBAR_ENTRIES];
+
 static unsigned bx_headerbar_y = 0;
 static unsigned bx_headerbar_entries = 0;
 static unsigned bx_bitmap_left_xorigin = 0;  // pixels from left
@@ -194,8 +195,7 @@
 static void create_vga_font(void);
 static BBitmap *vgafont[256];
 
-  void
-bx_beos_gui_c::specific_init(int argc, char **argv,
+void bx_beos_gui_c::specific_init(int argc, char **argv,
                         unsigned tilewidth, unsigned tileheight,
                         unsigned header_bar_y)
 {

Index: win32.cc
===================================================================
RCS file: /cvsroot/bochs/bochs/gui/win32.cc,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- win32.cc	4 Dec 2009 20:02:12 -0000	1.135
+++ win32.cc	24 Jan 2010 12:46:42 -0000	1.136
@@ -133,8 +133,8 @@
 
 // Headerbar stuff
 HWND hwndTB, hwndSB;
-unsigned bx_bitmap_entries;
-struct {
+static unsigned bx_bitmap_entries;
+static struct {
   HBITMAP bmap;
   unsigned xdim;
   unsigned ydim;

Index: x.cc
===================================================================
RCS file: /cvsroot/bochs/bochs/gui/x.cc,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- x.cc	4 Dec 2009 20:02:12 -0000	1.128
+++ x.cc	24 Jan 2010 12:46:42 -0000	1.129
@@ -127,12 +127,12 @@
 
 static Pixmap vgafont[256];
 
+static unsigned bx_bitmap_entries = 0;
 static struct {
   Pixmap bmap;
   unsigned xdim;
   unsigned ydim;
-  } bx_bitmaps[BX_MAX_PIXMAPS];
-unsigned bx_bitmap_entries = 0;
+} bx_bitmaps[BX_MAX_PIXMAPS];
 
 static struct {
   Pixmap   bitmap;
@@ -142,7 +142,8 @@
   unsigned yorigin;
   unsigned alignment;
   void (*f)(void);
-  } bx_headerbar_entry[BX_MAX_HEADERBAR_ENTRIES];
+} bx_headerbar_entry[BX_MAX_HEADERBAR_ENTRIES];
+
 static unsigned bx_headerbar_y = 0;
 static unsigned bx_headerbar_entries = 0;
 static unsigned bx_bitmap_left_xorigin = 0;  // pixels from left
@@ -151,7 +152,7 @@
 static unsigned bx_statusbar_y = 18;
 static unsigned bx_statusitem_pos[12] = {
   0, 200, 240, 280, 320, 360, 400, 440, 480, 520, 560, 600
-  };
+};
 static bx_bool bx_statusitem_active[12];
 static long bx_status_led_green, bx_status_led_red, bx_status_graytext;
 static char bx_status_info_text[34];