diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-01-19 00:22:22 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-01-19 00:22:22 +0000 |
| commit | 15537aa2af2dd52afdccafcbda1ce3bfd1f1657e (patch) | |
| tree | be1de7e36b33383016cb9538099769552b04c820 | |
| parent | 73b158d27d95615439334b400c05bc1a9b8453db (diff) | |
| download | netsurf-15537aa2af2dd52afdccafcbda1ce3bfd1f1657e.tar.gz netsurf-15537aa2af2dd52afdccafcbda1ce3bfd1f1657e.tar.bz2 | |
The OS3 build doesn't appear to like non-specific layout groups
| -rw-r--r-- | amiga/gui.c | 2 | ||||
| -rw-r--r-- | amiga/os3support.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index 61904079e..28921197d 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -5155,7 +5155,7 @@ Object *ami_gui_splash_open(void) WINDOW_Position, WPOS_CENTERSCREEN, WINDOW_LockWidth, TRUE, WINDOW_LockHeight, TRUE, - WINDOW_ParentGroup, LayoutObject, + WINDOW_ParentGroup, VGroupObject, LAYOUT_AddImage, bm_obj = BitMapObject, BITMAP_SourceFile, "PROGDIR:Resources/splash.png", BITMAP_Screen, wbscreen, diff --git a/amiga/os3support.c b/amiga/os3support.c index 724ac2079..f69df1508 100644 --- a/amiga/os3support.c +++ b/amiga/os3support.c @@ -79,15 +79,18 @@ uint32 GetAttrs(Object *obj, Tag tag1, ...) va_list ap; Tag tag = tag1; ULONG data = 0; + int i = 0; va_start(ap, tag1); while(tag != TAG_DONE) { data = va_arg(ap, ULONG); - GetAttr(tag, obj, (void *)data); + i += GetAttr(tag, obj, (void *)data); tag = va_arg(ap, Tag); } va_end(ap); + + return i; } /* Utility */ |