mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed some gcc 4.x warnings

Browse Source
This commit is contained in:
Volker Ruppert 2006-12-27 15:21:03 +00:00
parent ee6bd95cfc
commit 7213eae1bb
5 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bochs/gui/keymap.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: keymap.cc,v 1.19 2006-04-10 19:02:30 sshwarts Exp $
// $Id: keymap.cc,v 1.20 2006-12-27 15:21:03 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -198,7 +198,7 @@ void bx_keymap_c::loadKeymap(Bit32u stringToSymbol(const char*), const char* fil
{
FILE *keymapFile;
char baseSym[256], modSym[256], hostSym[256];
Bit32s ascii;
Bit32s ascii = 0;
Bit32u baseKey, modKey, hostKey;
struct stat status;
@ -230,7 +230,7 @@ void bx_keymap_c::loadKeymap(Bit32u stringToSymbol(const char*), const char* fil
hostKey = stringToSymbol(hostSym);
BX_DEBUG(("baseKey='%s' (%d), modSym='%s' (%d), ascii=%d, guisym='%s' (%d)", baseSym, baseKey, modSym, modKey, ascii, hostSym, hostKey));
// Check if data is valid
if (baseKey==BX_KEYMAP_UNKNOWN) {
BX_PANIC (("line %d: unknown BX_KEY constant '%s'",lineCount,baseSym));
@ -243,7 +243,7 @@ void bx_keymap_c::loadKeymap(Bit32u stringToSymbol(const char*), const char* fil
}
keymapTable=(BXKeyEntry*)realloc(keymapTable,(keymapCount+1) * sizeof(BXKeyEntry));
if (keymapTable==NULL)
BX_PANIC(("Can not allocate memory for keymap table."));
@ -251,7 +251,7 @@ void bx_keymap_c::loadKeymap(Bit32u stringToSymbol(const char*), const char* fil
keymapTable[keymapCount].modKey=modKey;
keymapTable[keymapCount].ascii=ascii;
keymapTable[keymapCount].hostKey=hostKey;
keymapCount++;
}

10
bochs/gui/rfb.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: rfb.cc,v 1.49 2006-02-21 21:35:08 vruppert Exp $
// $Id: rfb.cc,v 1.50 2006-12-27 15:21:03 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2000 Psyon.Org!
@ -100,13 +100,13 @@ static unsigned short rfbPort;
// Headerbar stuff
unsigned rfbBitmapCount = 0;
struct {
static struct {
char *bmap;
unsigned xdim;
unsigned ydim;
} rfbBitmaps[BX_MAX_PIXMAPS];
unsigned rfbHeaderbarBitmapCount = 0;
static unsigned rfbHeaderbarBitmapCount = 0;
struct {
unsigned int index;
unsigned int xorigin;
@ -119,7 +119,7 @@ struct {
#define KEYBOARD true
#define MOUSE false
#define MAX_KEY_EVENTS 512
struct {
static struct {
bool type;
int key;
int down;
@ -130,7 +130,7 @@ static unsigned long rfbKeyboardEvents = 0;
static bool bKeyboardInUse = false;
// Misc Stuff
struct {
static struct {
unsigned int x;
unsigned int y;
unsigned int width;

3
bochs/gui/siminterface.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: siminterface.h,v 1.204 2006-12-17 08:17:28 vruppert Exp $
// $Id: siminterface.h,v 1.205 2006-12-27 15:21:03 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Intro to siminterface by Bryce Denney:
@ -1101,6 +1101,7 @@ enum disp_mode_t { DISP_MODE_CONFIG=100, DISP_MODE_SIM };
class BOCHSAPI bx_simulator_interface_c {
public:
bx_simulator_interface_c() {}
virtual ~bx_simulator_interface_c() {}
virtual void set_quit_context(jmp_buf *context) {}
virtual int get_init_done() { return -1; }
virtual int set_init_done(int n) {return -1;}

3
bochs/iodev/eth.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth.h,v 1.16 2006-03-07 21:11:16 sshwarts Exp $
// $Id: eth.h,v 1.17 2006-12-27 15:21:03 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -72,6 +72,7 @@ public:
char *script);
protected:
eth_locator_c(const char *type);
virtual ~eth_locator_c() {}
virtual eth_pktmover_c *allocate(const char *netif,
const char *macaddr,
eth_rx_handler_t rxh,

3
bochs/iodev/hdimage.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: hdimage.h,v 1.7 2006-11-18 11:51:07 vruppert Exp $
// $Id: hdimage.h,v 1.8 2006-12-27 15:21:03 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2005 MandrakeSoft S.A.
@ -131,6 +131,7 @@ class device_image_t
public:
// Default constructor
device_image_t();
virtual ~device_image_t() {}
// Open a image. Returns non-negative if successful.
virtual int open(const char* pathname) = 0;