diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2022-03-11 16:31:58 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2022-03-11 16:31:58 +0000 |
| commit | fba1d54ccb38788defad17c5036200fe7cc81e5a (patch) | |
| tree | fa8e5f5e43363c4a26776143d26a1f1e82472e1c | |
| parent | d34699a0524383c208b03bf9ed4b75d687c280e9 (diff) | |
| download | netsurf-fba1d54ccb38788defad17c5036200fe7cc81e5a.tar.gz netsurf-fba1d54ccb38788defad17c5036200fe7cc81e5a.tar.bz2 | |
AMIGA: Fix some redefined values
| -rw-r--r-- | frontends/amiga/arexx.c | 9 | ||||
| -rw-r--r-- | frontends/amiga/cookies.c | 2 | ||||
| -rw-r--r-- | frontends/amiga/libs.h | 2 | ||||
| -rw-r--r-- | frontends/amiga/os3support.c | 2 | ||||
| -rw-r--r-- | frontends/amiga/os3support.h | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c index f937fdb17..8a8d25993 100644 --- a/frontends/amiga/arexx.c +++ b/frontends/amiga/arexx.c @@ -126,14 +126,13 @@ STATIC struct ARexxCmd Commands[] = bool ami_arexx_init(ULONG *rxsig) { - if((arexx_obj = ARexxObj, + if((arexx_obj = ARexxObj, NULL, AREXX_HostName,"NETSURF", AREXX_Commands,Commands, AREXX_NoSlot,TRUE, AREXX_ReplyHook,NULL, AREXX_DefExtension,"nsrx", - End)) - { + TAG_DONE))) { GetAttr(AREXX_SigMask, arexx_obj, rxsig); return true; } @@ -141,13 +140,13 @@ bool ami_arexx_init(ULONG *rxsig) { /* Create a temporary ARexx port so we can send commands to the NetSurf which * is already running */ - arexx_obj = ARexxObj, + arexx_obj = ARexxObj, NULL, AREXX_HostName,"NETSURF", AREXX_Commands,Commands, AREXX_NoSlot,FALSE, AREXX_ReplyHook,NULL, AREXX_DefExtension,"nsrx", - End; + TAG_DONE); return false; } diff --git a/frontends/amiga/cookies.c b/frontends/amiga/cookies.c index 3cd32f37e..e2b51faa4 100644 --- a/frontends/amiga/cookies.c +++ b/frontends/amiga/cookies.c @@ -335,7 +335,7 @@ ami_cookies_create_window(struct ami_cookie_window *cookie_win) GA_RelVerify, TRUE, SpaceEnd, EndGroup, - EndWindow; + EndWindow); if(ami_cw->objects[GID_CW_WIN] == NULL) { return NSERROR_NOMEM; diff --git a/frontends/amiga/libs.h b/frontends/amiga/libs.h index db5b65c75..dd8295001 100644 --- a/frontends/amiga/libs.h +++ b/frontends/amiga/libs.h @@ -76,6 +76,8 @@ extern Class *WindowClass; #define StringObj NewObject(StringClass, NULL #define WindowObj NewObject(WindowClass, NULL +#define EndObj TAG_DONE) + /* Functions */ bool ami_libs_open(void); void ami_libs_close(void); diff --git a/frontends/amiga/os3support.c b/frontends/amiga/os3support.c index 23e922a41..af3cb0666 100644 --- a/frontends/amiga/os3support.c +++ b/frontends/amiga/os3support.c @@ -299,5 +299,7 @@ ULONG RefreshSetGadgetAttrs(struct Gadget *g, struct Window *w, struct Requester return RefreshSetGadgetAttrsA(g,w,r,(struct TagItem *) &tag1); } + + #endif diff --git a/frontends/amiga/os3support.h b/frontends/amiga/os3support.h index 2df014117..12c7e0a2b 100644 --- a/frontends/amiga/os3support.h +++ b/frontends/amiga/os3support.h @@ -84,8 +84,6 @@ #define TNA_HintInfo TAG_IGNORE #define WA_ContextMenuHook TAG_IGNORE #define WA_ToolBox TAG_IGNORE -#define WINDOW_BuiltInScroll TAG_IGNORE -#define WINDOW_NewPrefsHook TAG_IGNORE /* raw keycodes */ #define RAWKEY_BACKSPACE 0x41 |