summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2015-01-18 18:53:41 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2015-01-18 18:53:41 +0000
commit69075f1c5744e77ac819d08821dffc90eb73b5d3 (patch)
tree7df2036753911357848d8c8269fab82118de439f
parent6f9d96aedf44ac528d3b52ea89f6cd4e19286b8f (diff)
downloadnetsurf-69075f1c5744e77ac819d08821dffc90eb73b5d3.tar.gz
netsurf-69075f1c5744e77ac819d08821dffc90eb73b5d3.tar.bz2
Fixup gui_options.c for OS3
-rwxr-xr-xamiga/gui_options.c5
-rw-r--r--amiga/os3support.h7
2 files changed, 10 insertions, 2 deletions
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index d4a755e25..2187c30ab 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -491,8 +491,9 @@ void ami_gui_opts_open(void)
scaledisabled = TRUE;
scaleselected = FALSE;
}
-
+#ifdef __amigaos4__
if(ApplicationBase->lib_Version < 53)
+#endif
{
download_notify_disabled = TRUE;
nsoption_set_bool(download_notify, FALSE);
@@ -526,7 +527,7 @@ void ami_gui_opts_open(void)
{
ami_gui_opts_setup();
- gow = AllocVecTags(sizeof(struct ami_gui_opts_window), AVT_ClearWithValue, 0, TAG_DONE);
+ gow = ami_misc_allocvec_clear(sizeof(struct ami_gui_opts_window), 0);
gow->objects[OID_MAIN] = WindowObject,
WA_ScreenTitle, ami_gui_get_screen_title(),
diff --git a/amiga/os3support.h b/amiga/os3support.h
index d0979e063..5fb113466 100644
--- a/amiga/os3support.h
+++ b/amiga/os3support.h
@@ -56,6 +56,8 @@
#define CLICKTAB_FlagImage TAG_IGNORE
#define CLICKTAB_LabelTruncate TAG_IGNORE
#define CLICKTAB_NodeClosed TAG_IGNORE
+#define GETFONT_OTagOnly TAG_IGNORE
+#define GETFONT_ScalableOnly TAG_IGNORE
#define PDTA_PromoteMask TAG_IGNORE
#define RPTAG_APenColor TAG_IGNORE
#define GA_HintInfo TAG_IGNORE
@@ -95,6 +97,11 @@
/* Renamed structures */
#define AnchorPathOld AnchorPath
+/* ReAction (ClassAct) macros */
+#define GetFileEnd End
+#define GetFontEnd End
+#define GetScreenModeEnd End
+
/* Easy compat macros */
/* application */
#define Notify(...) (void)0