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

fixed build failures if I have both X and SDL enabled.

Browse Source
This commit is contained in:
Stanislav Shwartsman 2009-10-24 13:22:36 +00:00
parent f6bc8ec9d1
commit 85bf2cee79
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/gui/sdl.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: sdl.cc,v 1.86 2009-10-24 13:17:33 sshwarts Exp $
// $Id: sdl.cc,v 1.87 2009-10-24 13:22:36 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -145,8 +145,8 @@ static void headerbar_click(int x);
#if !defined(WIN32) && BX_DEBUGGER && BX_DEBUGGER_GUI
BxEvent *sdl_notify_callback (void *unused, BxEvent *event);
bxevent_handler old_callback = NULL;
void *old_callback_arg = NULL;
static bxevent_handler old_callback = NULL;
static void *old_callback_arg = NULL;
#endif
#if BX_SHOW_IPS

6
bochs/gui/x.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: x.cc,v 1.126 2009-03-22 20:18:17 vruppert Exp $
// $Id: x.cc,v 1.127 2009-10-24 13:22:36 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -312,8 +312,8 @@ unsigned curr_foreground, curr_background;
static unsigned x_tilesize, y_tilesize;
BxEvent *x11_notify_callback (void *unused, BxEvent *event);
bxevent_handler old_callback = NULL;
void *old_callback_arg = NULL;
static bxevent_handler old_callback = NULL;
static void *old_callback_arg = NULL;
// Try to allocate NCOLORS at once in the colormap provided. If it can