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

compilation fix for win64

Browse Source
This commit is contained in:
Stanislav Shwartsman 2010-06-10 15:59:04 +00:00
parent eaa2e0e0ea
commit a896dbfb2d
2 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bochs/bochs.h
View File

@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: bochs.h,v 1.254 2010-05-15 09:23:50 vruppert Exp $ // $Id: bochs.h,v 1.255 2010-06-10 15:59:04 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001-2009 The Bochs Project // Copyright (C) 2001-2010 The Bochs Project
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -328,23 +328,9 @@ public:
void add_logfn(logfunc_t *fn); void add_logfn(logfunc_t *fn);
void remove_logfn(logfunc_t *fn); void remove_logfn(logfunc_t *fn);
void set_log_action(int loglevel, int action); void set_log_action(int loglevel, int action);
const char *getlevel(int i) { const char *getlevel(int i);
static const char *loglevel[N_LOGLEV] = { char *getaction(int i);
"DEBUG",
"INFO",
"ERROR",
"PANIC",
"PASS"
};
if (i>=0 && i<N_LOGLEV) return loglevel[i];
else return "?";
}
char *getaction(int i) {
static const char *name[] = { "ignore", "report", "ask", "fatal" };
assert (i>=ACT_IGNORE && i<N_ACT);
return (char *) name[i];
}
protected: protected:
int n_logfn; int n_logfn;
#define MAX_LOGFNS 512 #define MAX_LOGFNS 512

25
bochs/logio.cc
View File

@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: logio.cc,v 1.75 2009-12-04 20:02:12 sshwarts Exp $ // $Id: logio.cc,v 1.76 2010-06-10 15:59:04 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001-2009 The Bochs Project // Copyright (C) 2001-2010 The Bochs Project
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -37,6 +37,27 @@
static int Allocio=0; static int Allocio=0;
const char* iofunctions::getlevel(int i)
{
static const char *loglevel[N_LOGLEV] = {
"DEBUG",
"INFO",
"ERROR",
"PANIC",
"PASS"
};
if (i>=0 && i<N_LOGLEV) return loglevel[i];
else return "?";
}
char* iofunctions::getaction(int i)
{
static const char *name[] = { "ignore", "report", "ask", "fatal" };
assert (i>=ACT_IGNORE && i<N_ACT);
return (char *) name[i];
}
void iofunctions::flush(void) void iofunctions::flush(void)
{ {
if(logfd && magic == MAGIC_LOGNUM) { if(logfd && magic == MAGIC_LOGNUM) {