From f4903743baa616e39aefdab2d2b9920cb7a348fe Mon Sep 17 00:00:00 2001 From: Chris Young Date: Wed, 5 Aug 2015 23:42:20 +0100 Subject: Abstract all instances of NewMinList as it causes alert 80000006 on OS3 --- amiga/object.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) (limited to 'amiga/object.c') diff --git a/amiga/object.c b/amiga/object.c index 16e14d46f..4af924734 100755 --- a/amiga/object.c +++ b/amiga/object.c @@ -29,25 +29,38 @@ #include "amiga/misc.h" #include "amiga/object.h" -#include "utils/log.h" - #ifdef __amigaos4__ +#define nsList MinList #define NewnsList NewMinList #else +#define nsList List #define NewnsList NewList #endif +/****/ -struct nsList *NewObjList(void) +/* Slightly abstract MinList initialisation */ +void ami_NewMinList(struct MinList *list) { - struct nsList *objlist = (struct nsList *)AllocVecTagList(sizeof(struct nsList), NULL); - if(objlist == NULL) return NULL; + if(list == NULL) return; + NewnsList((struct nsList *)list); +} - NewnsList(objlist); +/* Allocate and initialise a new MinList */ +struct MinList *ami_AllocMinList(void) +{ + struct MinList *objlist = (struct MinList *)AllocVecTagList(sizeof(struct nsList), NULL); + if(objlist == NULL) return NULL; + ami_NewMinList(objlist); + return objlist; +} +struct MinList *NewObjList(void) +{ + struct MinList *objlist = ami_AllocMinList(); return(objlist); } -struct nsObject *AddObject(struct nsList *objlist, ULONG otype) +struct nsObject *AddObject(struct MinList *objlist, ULONG otype) { struct nsObject *dtzo; @@ -81,7 +94,7 @@ void DelObjectNoFree(struct nsObject *dtzo) DelObjectInternal(dtzo, FALSE); } -void FreeObjList(struct nsList *objlist) +void FreeObjList(struct MinList *objlist) { struct nsObject *node; struct nsObject *nnode; -- cgit v1.2.3