summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2015-01-29 19:31:47 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2015-01-29 19:31:47 +0000
commite5b6dac87c4989fbaae5fc63292f0b0ce9d77601 (patch)
tree49ffb684c12592eb34d3a673304ff95a7bec3de4
parent0e3cbbb67bdfb3d3799fa904f8eb5b1357118d3f (diff)
downloadnetsurf-e5b6dac87c4989fbaae5fc63292f0b0ce9d77601.tar.gz
netsurf-e5b6dac87c4989fbaae5fc63292f0b0ce9d77601.tar.bz2
Fix OS3 build
Fix font cache on OS3
-rwxr-xr-xamiga/font.c4
-rw-r--r--amiga/gui.c2
-rwxr-xr-xamiga/gui.h2
-rw-r--r--amiga/menu.c4
-rw-r--r--amiga/os3support.h1
5 files changed, 5 insertions, 8 deletions
diff --git a/amiga/font.c b/amiga/font.c
index 8a47b4529..4fbd60ace 100755
--- a/amiga/font.c
+++ b/amiga/font.c
@@ -370,7 +370,6 @@ static struct ami_font_node *ami_font_open(const char *font)
struct nsObject *node;
struct ami_font_node *nodedata;
-#ifdef __amigaos4__
node = (struct nsObject *)FindIName((struct List *)ami_font_list, font);
if(node)
{
@@ -378,9 +377,6 @@ static struct ami_font_node *ami_font_open(const char *font)
GetSysTime(&nodedata->lastused);
return nodedata;
}
-#else
-#warning FIXME: font cache won't work on OS3
-#endif
LOG(("Font cache miss: %s", font));
diff --git a/amiga/gui.c b/amiga/gui.c
index 4873b6380..0ce952cca 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -3589,7 +3589,7 @@ gui_window_create(struct browser_window *bw,
iconifygadget = TRUE;
ami_create_menu(g->shared);
#ifndef __amigaos4__
- struct Menu *menu = ami_menu_create_os3(g->shared->menu);
+ struct Menu *menu = ami_menu_create_os3(g->shared, g->shared->menu);
#endif
NewList(&g->shared->tab_list);
g->tab_node = AllocClickTabNode(TNA_Text,messages_get("NetSurf"),
diff --git a/amiga/gui.h b/amiga/gui.h
index 3ec050f16..246d75124 100755
--- a/amiga/gui.h
+++ b/amiga/gui.h
@@ -131,7 +131,7 @@ struct gui_window_2 {
struct MinList shared_pens;
gui_pointer_shape mouse_pointer;
#ifndef __amigaos4__
- struct NewMenu *menu;
+ struct NewMenu *menu_os3;
struct VisualInfo *vi;
#endif
};
diff --git a/amiga/menu.c b/amiga/menu.c
index 712c6716b..b289c3a1d 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -338,7 +338,7 @@ void ami_menu_refresh(struct gui_window_2 *gwin)
ami_free_menulabs(gwin);
ami_create_menu(gwin);
#ifndef __amigaos4__
- gwin->menu_os3 = ami_menu_create_os3(gwin->menu);
+ gwin->menu_os3 = ami_menu_create_os3(gwin, gwin->menu);
#endif
SetAttrs(gwin->objects[OID_MAIN],
@@ -552,7 +552,7 @@ struct Menu *ami_menu_create_os3(struct gui_window_2 *gwin, struct NewMenu *newm
{
gwin->vi = GetVisualInfo(scrn, TAG_DONE);
gwin->menu_os3 = CreateMenus(newmenu, TAG_DONE);
- LayoutMenus(menu, vi, TAG_DONE);
+ LayoutMenus(gwin->menu_os3, gwin->vi, TAG_DONE);
return gwin->menu_os3;
}
#endif
diff --git a/amiga/os3support.h b/amiga/os3support.h
index a9806eafb..44fca5cef 100644
--- a/amiga/os3support.h
+++ b/amiga/os3support.h
@@ -141,6 +141,7 @@
/* Exec */
#define AllocVecTagList(SZ,TAG) AllocVec(SZ,MEMF_ANY) /* AllocVecTagList with no tags */
+#define FindIName FindName
#define GetPred(N) (N)->ln_Pred
#define GetSucc(N) (N)->ln_Succ