diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-01-25 01:06:46 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-01-25 01:06:46 +0000 |
| commit | bb9d23d04041e4647a2d8c71a98e0bb30defa3ce (patch) | |
| tree | 8088bc61117d76dabe8d99ae4a904a39c381a1d0 | |
| parent | e89072b3d025f3920a00ac25c6bbe29d749a0afb (diff) | |
| download | netsurf-bb9d23d04041e4647a2d8c71a98e0bb30defa3ce.tar.gz netsurf-bb9d23d04041e4647a2d8c71a98e0bb30defa3ce.tar.bz2 | |
Fix build on OS3
| -rw-r--r-- | amiga/gui.c | 5 | ||||
| -rw-r--r-- | amiga/libs.c | 32 |
2 files changed, 33 insertions, 4 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index 2fa1c5ef6..eb60b37d5 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -5186,6 +5186,11 @@ Object *ami_gui_splash_open(void) LayoutEnd, EndWindow; + LOG(("WindowBase = %p", WindowBase)); + LOG(("WindowObject = %p", win_obj)); + LOG(("BitMapBase = %p", BitMapBase)); + LOG(("BitMapObject = %p", bm_obj)); + LOG(("Attempting to open splash window...")); win = RA_OpenWindow(win_obj); diff --git a/amiga/libs.c b/amiga/libs.c index 6e9bcf9e0..da47010b5 100644 --- a/amiga/libs.c +++ b/amiga/libs.c @@ -27,6 +27,30 @@ #include <proto/intuition.h> #include <proto/utility.h> +#ifndef __amigaos4__ +/* OS3 needs these for the XXXX_GetClass() functions */ +#include <proto/arexx.h> +#include <proto/bevel.h> +#include <proto/bitmap.h> +#include <proto/chooser.h> +#include <proto/checkbox.h> +#include <proto/clicktab.h> +#include <proto/fuelgauge.h> +#include <proto/getfile.h> +#include <proto/getfont.h> +#include <proto/getscreenmode.h> +#include <proto/integer.h> +#include <proto/label.h> +#include <proto/layout.h> +#include <proto/listbrowser.h> +#include <proto/radiobutton.h> +#include <proto/scroller.h> +#include <proto/space.h> +#include <proto/speedbar.h> +#include <proto/string.h> +#include <proto/window.h> +#endif + #ifdef __amigaos4__ #define AMINS_LIB_OPEN(LIB, LIBVER, PREFIX, INTERFACE, INTVER, FAIL) \ LOG(("Opening %s v%d", LIB, LIBVER)); \ @@ -93,14 +117,14 @@ } #define AMINS_LIB_CLOSE(PREFIX) \ - if(PREFIX##Base) CloseLibrary(PREFIX##Base); + if(PREFIX##Base) CloseLibrary((struct Library *)PREFIX##Base); #define AMINS_LIB_STRUCT(PREFIX) \ struct PREFIX##Base *PREFIX##Base; #define AMINS_CLASS_OPEN(CLASS, CLASSVER, PREFIX, CLASSGET, NEEDINTERFACE) \ LOG(("Opening %s v%d", CLASS, CLASSVER)); \ - if((PREFIX##Base = (struct PREFIX##Base *)OpenLibrary(CLASS, CLASSVER))) { \ + if((PREFIX##Base = OpenLibrary(CLASS, CLASSVER))) { \ PREFIX##Class = CLASSGET##_GetClass(); \ } else { \ STRPTR error = ASPrintf("Unable to open %s v%d (fatal error)", CLASS, CLASSVER); \ @@ -110,10 +134,10 @@ } #define AMINS_CLASS_CLOSE(PREFIX) \ - if(PREFIX##Base) CloseLibrary((struct Library *)PREFIX##Base); + if(PREFIX##Base) CloseLibrary(PREFIX##Base); #define AMINS_CLASS_STRUCT(PREFIX) \ - struct PREFIX##Base *PREFIX##Base; \ + struct Library *PREFIX##Base; \ Class *PREFIX##Class; #endif |