diff options
| -rw-r--r-- | amiga/Makefile.target | 4 | ||||
| -rw-r--r-- | amiga/fs_backing_store.c | 4 | ||||
| -rwxr-xr-x | amiga/schedule.c | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/amiga/Makefile.target b/amiga/Makefile.target index 70c0a80dd..3d76b3e84 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -5,9 +5,9 @@ CFLAGS += -std=c99 -Dnsamiga ifneq ($(SUBTARGET),os3) - CFLAGS += -U__STRICT_ANSI__ -D__USE_INLINE__ -D__USE_BASETYPE__ -DNSA_NO_ASYNC + CFLAGS += -U__STRICT_ANSI__ -D__USE_INLINE__ -D__USE_BASETYPE__ else - CFLAGS += -DPATH_MAX=1024 -DNSA_NO_ASYNC + CFLAGS += -DPATH_MAX=1024 endif NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE diff --git a/amiga/fs_backing_store.c b/amiga/fs_backing_store.c index 58746de1b..b6bd54c2b 100644 --- a/amiga/fs_backing_store.c +++ b/amiga/fs_backing_store.c @@ -21,7 +21,7 @@ #include "content/fs_backing_store.c" -#ifndef NSA_NO_ASYNC +#ifdef AMIGA_NS_ASYNC struct ami_bsm_store { nsurl *url; enum backing_store_flags flags; @@ -372,7 +372,7 @@ ami_backing_store_initialise(const struct llcache_store_parameters *parameters) #endif static struct gui_llcache_table amiga_llcache_table = { -#ifdef NSA_NO_ASYNC +#ifndef AMIGA_NS_ASYNC .initialise = initialise, .finalise = finalise, .store = store, diff --git a/amiga/schedule.c b/amiga/schedule.c index 71d963d2b..93389a8d9 100755 --- a/amiga/schedule.c +++ b/amiga/schedule.c @@ -31,7 +31,7 @@ #include "amiga/schedule.h" -#ifndef NSA_NO_ASYNC +#ifdef AMIGA_NS_ASYNC static struct MsgPort *smsgport = NULL; /* to send messages for the scheduler to */ #endif static struct TimeRequest *tioreq; @@ -254,7 +254,7 @@ static void ami_scheduler_run(struct MsgPort *nsmsgport) struct TimeVal tv; struct ami_schedule_message *asmsg; -#ifdef NSA_NO_ASYNC +#ifndef AMIGA_NS_ASYNC asmsg = AllocVecTagList(sizeof(struct ami_schedule_message), NULL); #else asmsg = AllocSysObjectTags(ASOT_MESSAGE, @@ -281,7 +281,7 @@ static void ami_scheduler_run(struct MsgPort *nsmsgport) asmsg->callback = callback; asmsg->p = p; -#ifdef NSA_NO_ASYNC +#ifndef AMIGA_NS_ASYNC schedule_run(asmsg); FreeVec(asmsg); #else @@ -386,7 +386,7 @@ nserror ami_schedule(int t, void (*callback)(void *p), void *p) { struct ami_schedule_message *asmsg; -#ifdef NSA_NO_ASYNC +#ifndef AMIGA_NS_ASYNC asmsg = AllocVecTagList(sizeof(struct ami_schedule_message), NULL); #else if(smsgport == NULL) return NSERROR_INIT_FAILED; @@ -400,7 +400,7 @@ nserror ami_schedule(int t, void (*callback)(void *p), void *p) asmsg->callback = callback; asmsg->p = p; -#ifdef NSA_NO_ASYNC +#ifndef AMIGA_NS_ASYNC ami_scheduler_schedule(asmsg); FreeVec(asmsg); #else @@ -415,7 +415,7 @@ void ami_schedule_handle(struct MsgPort *nsmsgport) /* nsmsgport is the NetSurf message port that the scheduler task * (or timer.device in no-async mode) is sending messages to. */ -#ifdef NSA_NO_ASYNC +#ifndef AMIGA_NS_ASYNC struct TimerRequest *timermsg; while((timermsg = (struct TimerRequest *)GetMsg(nsmsgport))) { @@ -532,7 +532,7 @@ static int32 ami_scheduler_process(STRPTR args, int32 length, APTR execbase) */ nserror ami_scheduler_process_create(struct MsgPort *nsmsgport) { -#ifdef NSA_NO_ASYNC +#ifndef AMIGA_NS_ASYNC ami_schedule_create(nsmsgport); #else if(nsmsgport == NULL) return NSERROR_INIT_FAILED; @@ -568,7 +568,7 @@ nserror ami_scheduler_process_create(struct MsgPort *nsmsgport) /* exported function documented in amiga/schedule.h */ void ami_scheduler_process_delete(void) { -#ifdef NSA_NO_ASYNC +#ifndef AMIGA_NS_ASYNC ami_schedule_free(NULL); #else if(smsgport == NULL) return; |