diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-02-04 00:09:34 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-02-04 00:09:34 +0000 |
| commit | 20630d799194954c53cd976f7de848a3cf47e297 (patch) | |
| tree | 631c60f86816eaf2d1b62afc391fc634d0142141 | |
| parent | 5bd9b45758a91f7b792d7da5657cfcec9b081481 (diff) | |
| parent | 36bc32b87bcfb9ed7ece8ddaab8962ee7c01d37f (diff) | |
| download | netsurf-20630d799194954c53cd976f7de848a3cf47e297.tar.gz netsurf-20630d799194954c53cd976f7de848a3cf47e297.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/bitmap-fonts
| -rwxr-xr-x | amiga/object.c | 9 | ||||
| -rw-r--r-- | amiga/plotters.c | 6 |
2 files changed, 5 insertions, 10 deletions
diff --git a/amiga/object.c b/amiga/object.c index f071cceb8..3ccd50b60 100755 --- a/amiga/object.c +++ b/amiga/object.c @@ -31,16 +31,9 @@ struct MinList *NewObjList(void) { - - struct MinList *objlist; - - objlist = (struct MinList *)AllocVecTagList(sizeof(struct MinList) + 10, NULL); -#warning List structure allocation is larger than necessary for debugging ^^^^ - + struct MinList *objlist = (struct MinList *)AllocVecTagList(sizeof(struct MinList), NULL); NewMinList(objlist); - return(objlist); - } struct nsObject *AddObject(struct MinList *objlist, ULONG otype) diff --git a/amiga/plotters.c b/amiga/plotters.c index 5077614b6..9455d1cde 100644 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -106,8 +106,10 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height) } else { palette_mapped = false; } -#if 0 - palette_mapped = true; /* only supporting palette mapped screens on OS3 for now */ + +#ifndef __amigaos4__ +#warning OS3 locked to palette-mapped modes + palette_mapped = true; if(depth > 8) depth = 8; #endif |