diff --git a/src/hardware/pic.cpp b/src/hardware/pic.cpp index 0b82a8e6..14e36ff2 100644 --- a/src/hardware/pic.cpp +++ b/src/hardware/pic.cpp @@ -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); }