From cce3699e0bcfb707ae0e9baa677c2c8fba4fb265 Mon Sep 17 00:00:00 2001 From: Stanislav Shwartsman Date: Tue, 1 Jan 2008 18:12:31 +0000 Subject: [PATCH] Fixed warning and possible compilation error --- bochs/bochs.h | 14 +++++++------- bochs/logio.cc | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bochs/bochs.h b/bochs/bochs.h index 8862b2288..fd4555d24 100644 --- a/bochs/bochs.h +++ b/bochs/bochs.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: bochs.h,v 1.219 2007-12-26 18:39:15 sshwarts Exp $ +// $Id: bochs.h,v 1.220 2008-01-01 18:12:31 sshwarts Exp $ ///////////////////////////////////////////////////////////////////////// // // Copyright (C) 2002 MandrakeSoft S.A. @@ -200,12 +200,12 @@ void print_tree(bx_param_c *node, int level = 0); #if BX_SUPPORT_SMP # define BX_TICK1_IF_SINGLE_PROCESSOR() \ - if (BX_SMP_PROCESSORS == 1) BX_TICK1() -# define BX_TICKN_IF_SINGLE_PROCESSOR() \ - if (BX_SMP_PROCESSORS == 1) BX_TICKN(n) + if (BX_SMP_PROCESSORS == 1) BX_TICK1() +# define BX_TICKN_IF_SINGLE_PROCESSOR(n) \ + if (BX_SMP_PROCESSORS == 1) BX_TICKN(n) #else -# define BX_TICK1_IF_SINGLE_PROCESSOR() BX_TICK1() -# define BX_TICKN_IF_SINGLE_PROCESSOR() BX_TICKN(n) +# define BX_TICK1_IF_SINGLE_PROCESSOR() BX_TICK1() +# define BX_TICKN_IF_SINGLE_PROCESSOR(n) BX_TICKN(n) #endif // you can't use static member functions on the CPU, if there are going @@ -515,7 +515,7 @@ extern bx_bool bx_gui_sighandler; #define BX_SMP_PROCESSORS 1 #endif -void bx_center_print(FILE *file, char *line, int maxwidth); +void bx_center_print(FILE *file, const char *line, unsigned maxwidth); #define BX_USE_PS2_MOUSE 1 diff --git a/bochs/logio.cc b/bochs/logio.cc index 5906a0c65..3ec81319d 100644 --- a/bochs/logio.cc +++ b/bochs/logio.cc @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: logio.cc,v 1.63 2007-12-30 18:02:22 sshwarts Exp $ +// $Id: logio.cc,v 1.64 2008-01-01 18:12:31 sshwarts Exp $ ///////////////////////////////////////////////////////////////////////// // // Copyright (C) 2001 MandrakeSoft S.A. @@ -616,7 +616,7 @@ void logfunctions::fatal(const char *prefix, const char *fmt, va_list ap, int ex iofunc_t *io = NULL; logfunc_t *genlog = NULL; -void bx_center_print(FILE *file, char *line, int maxwidth) +void bx_center_print(FILE *file, const char *line, unsigned maxwidth) { size_t len = strlen(line); if (len > maxwidth)