--- np2/macosx/Attic/np2info.cpp 2003/12/08 00:55:33 1.2 +++ np2/macosx/Attic/np2info.cpp 2004/01/23 17:37:39 1.5 @@ -4,7 +4,6 @@ #include "scrnmng.h" #include "np2info.h" #include "cpucore.h" -#include "memory.h" #include "pccore.h" #include "iocore.h" #include "bios.h" @@ -41,8 +40,6 @@ static const char str_egc[] = "EGC CG-Wi static const char *grcgchip[4] = {str_null, str_grcg, str_grcgcgwin, str_egc}; -extern int usesound; - #ifdef __cplusplus extern "C" { #endif @@ -76,14 +73,14 @@ static void info_clock(char *str, int ma UINT32 clock; char clockstr[16]; - clock = (pc.realclock + 50000) / 100000; + clock = (pccore.realclock + 50000) / 100000; SPRINTF(clockstr, str_clockfmt, clock/10, clock % 10); milstr_ncpy(str, clockstr, maxlen); } static void info_base(char *str, int maxlen) { - milstr_ncpy(str, (pc.baseclock == PCBASECLOCK25)?str_5MHz:str_8MHz, + milstr_ncpy(str, (pccore.baseclock == PCBASECLOCK25)?str_5MHz:str_8MHz, maxlen); }