# HG changeset patch # User Mychaela Falconia # Date 1529884685 0 # Node ID b4dd8c7e84cea1a8bf915375855bc1aa2551107c # Parent c4117b996197627fcd345ade911ca929be085b73 OSL: os_tim_ir.c compiles diff -r c4117b996197 -r b4dd8c7e84ce components/frame_na7_db_ir --- a/components/frame_na7_db_ir Sun Jun 24 23:53:33 2018 +0000 +++ b/components/frame_na7_db_ir Sun Jun 24 23:58:05 2018 +0000 @@ -46,3 +46,4 @@ cfile_plain $SRCDIR/os_mis_ir.c cfile_plain $SRCDIR/os_pro_ir.c cfile_plain $SRCDIR/os_sem_ir.c +cfile_plain $SRCDIR/os_tim_ir.c diff -r c4117b996197 -r b4dd8c7e84ce src/gpf2/osl/os_tim_ir.c --- a/src/gpf2/osl/os_tim_ir.c Sun Jun 24 23:53:33 2018 +0000 +++ b/src/gpf2/osl/os_tim_ir.c Sun Jun 24 23:58:05 2018 +0000 @@ -8,8 +8,7 @@ /* set of included headers from COFF symtab: */ #include -#include "gpfconf.h" /* FreeCalypso addition */ -#include "../../nucleus/nucleus.h" +#include "nucleus.h" #include "typedefs.h" #include "os.h" #include "gdi.h" @@ -31,7 +30,11 @@ extern NU_SEMAPHORE TimSemCB; extern NU_TIMER os_timer_cb; +#ifdef __GNUC__ #define BARRIER asm volatile ("": : :"memory") +#else +#define BARRIER /* prayer */ +#endif void timer_error(int err)