valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Fix bug 3528238: Name clash with compile option -DPIC

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3780
This commit is contained in:
Peter Veenstra 2012-05-20 18:41:04 +00:00
parent ff538caa62
commit 98d04262ec
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/hardware/pic.cpp
View file

@ -550,13 +550,13 @@ void TIMER_AddTick(void) {
}
}
class PIC:public Module_base{
/* Use full name to avoid name clash with compile option for position-independent code */
class PIC_8259A: public Module_base {
private:
IO_ReadHandleObject ReadHandler[4];
IO_WriteHandleObject WriteHandler[4];
public:
PIC(Section* configuration):Module_base(configuration){
PIC_8259A(Section* configuration):Module_base(configuration){
/* Setup pic0 and pic1 with initial values like DOS has normally */
PIC_IRQCheck=0;
PIC_IRQActive=PIC_NOIRQ;
@ -606,17 +606,17 @@ public:
pic_queue.free_entry=&pic_queue.entries[0];
pic_queue.next_entry=0;
}
~PIC(){
~PIC_8259A(){
}
};
static PIC* test;
static PIC_8259A* test;
void PIC_Destroy(Section* sec){
delete test;
}
void PIC_Init(Section* sec) {
test = new PIC(sec);
test = new PIC_8259A(sec);
sec->AddDestroyFunction(&PIC_Destroy);
}