mirrors
/
Bochs
mirror of https://github.com/bochs-emu/Bochs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- can't use "for (int i=0; ...)" twice because some compilers (e.g. MSVC++) 

think i is still defined the second time.
- MSVC++: can't use a variable to define another variable's array bounds.
  Now I use a #define for the array bounds instead.
This commit is contained in:
Bryce Denney 2002-09-03 15:59:52 +00:00
parent 765f21fbc3
commit 2644e2ac53
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bochs/main.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: main.cc,v 1.132 2002-09-03 08:42:23 bdenney Exp $ // $Id: main.cc,v 1.133 2002-09-03 15:59:52 bdenney Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2002 MandrakeSoft S.A. // Copyright (C) 2002 MandrakeSoft S.A.
@ -262,7 +262,8 @@ char *bx_param_string_handler (bx_param_string_c *param, int set, char *val, int
void bx_init_options () void bx_init_options ()
{ {
int i;
bx_list_c *menu; bx_list_c *menu;
bx_list_c *deplist; bx_list_c *deplist;
char name[1024], descr[1024]; char name[1024], descr[1024];
@ -533,13 +534,14 @@ void bx_init_options ()
bx_options.memory.Osize->set_ask_format ("Enter memory size (MB): [%d] "); bx_options.memory.Osize->set_ask_format ("Enter memory size (MB): [%d] ");
// initialize serial and parallel port options // initialize serial and parallel port options
int max = (BXP_PARAMS_PER_PARALLEL_PORT * BX_N_PARALLEL_PORTS) #define PAR_SER_INIT_LIST_MAX \
+ (BXP_PARAMS_PER_SERIAL_PORT * BX_N_SERIAL_PORTS); ((BXP_PARAMS_PER_PARALLEL_PORT * BX_N_PARALLEL_PORTS) \
bx_param_c *par_ser_init_list[1+max]; + (BXP_PARAMS_PER_SERIAL_PORT * BX_N_SERIAL_PORTS))
bx_param_c *par_ser_init_list[1+PAR_SER_INIT_LIST_MAX];
bx_param_c **par_ser_ptr = &par_ser_init_list[0]; bx_param_c **par_ser_ptr = &par_ser_init_list[0];
// parallel ports // parallel ports
for (int i=0; i<BX_N_PARALLEL_PORTS; i++) { for (i=0; i<BX_N_PARALLEL_PORTS; i++) {
sprintf (name, "Enable parallel port #%d", i+1); sprintf (name, "Enable parallel port #%d", i+1);
bx_options.par[i].Oenabled = new bx_param_bool_c ( bx_options.par[i].Oenabled = new bx_param_bool_c (
BXP_PARPORTx_ENABLED(i+1), BXP_PARPORTx_ENABLED(i+1),
@ -562,7 +564,7 @@ void bx_init_options ()
} }
// serial ports // serial ports
for (int i=0; i<BX_N_SERIAL_PORTS; i++) { for (i=0; i<BX_N_SERIAL_PORTS; i++) {
// options for COM port // options for COM port
sprintf (name, "Enable serial port #%d (COM%d)", i+1, i+1); sprintf (name, "Enable serial port #%d (COM%d)", i+1, i+1);
sprintf (descr, "Controls whether COM%d is installed or not", i+1); sprintf (descr, "Controls whether COM%d is installed or not", i+1);