summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--riscos/htmlredraw.c2
-rw-r--r--riscos/menus.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/riscos/htmlredraw.c b/riscos/htmlredraw.c
index 198fde7cd..f9afd814e 100644
--- a/riscos/htmlredraw.c
+++ b/riscos/htmlredraw.c
@@ -9,12 +9,12 @@
#include <assert.h>
#include <stdbool.h>
#include <string.h>
+#include "swis.h"
#include "oslib/colourtrans.h"
#include "oslib/draw.h"
#include "oslib/font.h"
#include "oslib/os.h"
#include "oslib/wimp.h"
-#include "swis.h"
#include "netsurf/utils/config.h"
#include "netsurf/css/css.h"
#include "netsurf/content/content.h"
diff --git a/riscos/menus.c b/riscos/menus.c
index 7cf598fc8..9e5174ae2 100644
--- a/riscos/menus.c
+++ b/riscos/menus.c
@@ -63,7 +63,7 @@ struct content *save_content = 0;
/* Iconbar menu
*/
-wimp_menu *iconbar_menu = (wimp_menu *)&(wimp_MENU(4)) {
+static wimp_MENU(4) ibar_menu = {
{ "NetSurf" }, 7,2,7,0, 200, 44, 0,
{
{ 0, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "Info" } },
@@ -73,6 +73,7 @@ wimp_menu *iconbar_menu = (wimp_menu *)&(wimp_MENU(4)) {
}
};
int iconbar_menu_height = 4 * 44;
+wimp_menu *iconbar_menu = (wimp_menu *)&ibar_menu;
/* Export submenu