From 31de1c251b5c6f6a39f6f7500e28c6086b807953 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Wed, 20 Apr 2016 15:54:18 +0100
Subject: Cleanup amiga include issues introduced as part of core updates

---
 amiga/arexx.c         |  8 +++++---
 amiga/bitmap.c        |  2 ++
 amiga/clipboard.c     |  3 +++
 amiga/ctxmenu.c       | 22 +++++++++++++---------
 amiga/download.c      |  1 +
 amiga/dt_anim.c       |  1 +
 amiga/dt_picture.c    |  1 +
 amiga/file.c          |  2 ++
 amiga/font_cache.c    |  2 +-
 amiga/font_diskfont.c |  2 ++
 amiga/gui.c           |  1 +
 amiga/gui.h           | 10 +++++++---
 amiga/gui_options.c   |  2 ++
 amiga/login.c         |  1 +
 amiga/menu.c          |  5 ++++-
 amiga/menu.h          | 14 ++++++++------
 amiga/misc.c          |  2 ++
 amiga/plugin_hack.c   |  2 ++
 amiga/print.c         |  2 ++
 19 files changed, 60 insertions(+), 23 deletions(-)

(limited to 'amiga')

diff --git a/amiga/arexx.c b/amiga/arexx.c
index 412fc4056..dec40e096 100644
--- a/amiga/arexx.c
+++ b/amiga/arexx.c
@@ -29,13 +29,15 @@
 #include <gadgets/clicktab.h>
 #include <reaction/reaction_macros.h>
 
+#include "utils/utils.h"
+#include "utils/log.h"
+#include "utils/nsoption.h"
+#include "utils/nsurl.h"
+#include "content/hlcache.h"
 #include "desktop/browser.h"
 #include "desktop/gui_window.h"
 #include "desktop/version.h"
 
-#include "utils/log.h"
-#include "utils/nsoption.h"
-
 #include "amiga/arexx.h"
 #include "amiga/download.h"
 #include "amiga/gui.h"
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 3d5f47f89..9f534443a 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -18,6 +18,7 @@
 
 #include "amiga/os3support.h"
 
+#include <stdlib.h>
 #include <proto/exec.h>
 #ifdef __amigaos4__
 #include <graphics/blitattr.h>
@@ -37,6 +38,7 @@
 #include "utils/nsoption.h"
 #include "utils/nsurl.h"
 #include "utils/messages.h"
+#include "content/hlcache.h"
 #include "desktop/mouse.h"
 #include "desktop/gui_window.h"
 #include "image/bitmap.h"
diff --git a/amiga/clipboard.c b/amiga/clipboard.c
index 92bf4df66..12ceb0f09 100644
--- a/amiga/clipboard.c
+++ b/amiga/clipboard.c
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdlib.h>
 #include <proto/iffparse.h>
 #include <proto/intuition.h>
 #include <proto/exec.h>
@@ -28,6 +29,8 @@
 
 #include "utils/nsoption.h"
 #include "utils/utf8.h"
+#include "utils/nsurl.h"
+#include "content/hlcache.h"
 #include "desktop/browser.h"
 #include "desktop/plotters.h"
 #include "desktop/textinput.h"
diff --git a/amiga/ctxmenu.c b/amiga/ctxmenu.c
index b49ba8066..9320fac26 100644
--- a/amiga/ctxmenu.c
+++ b/amiga/ctxmenu.c
@@ -23,6 +23,7 @@
 #ifdef __amigaos4__
 #include <string.h>
 
+#include <stdlib.h>
 #include <proto/exec.h>
 #include <proto/intuition.h>
 
@@ -34,6 +35,18 @@
 #include <intuition/menuclass.h>
 #include <reaction/reaction_macros.h>
 
+#include "utils/utils.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/nsoption.h"
+#include "utils/nsurl.h"
+#include "content/hlcache.h"
+#include "desktop/browser.h"
+#include "desktop/browser_history.h"
+#include "desktop/mouse.h"
+#include "desktop/searchweb.h"
+#include "desktop/textinput.h"
+
 #include "amiga/bitmap.h"
 #include "amiga/clipboard.h"
 #include "amiga/ctxmenu.h"
@@ -44,15 +57,6 @@
 #include "amiga/theme.h"
 #include "amiga/utf8.h"
 
-#include "desktop/browser.h"
-#include "desktop/browser_history.h"
-#include "desktop/mouse.h"
-#include "desktop/searchweb.h"
-#include "desktop/textinput.h"
-
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/nsoption.h"
 
 enum {
 	AMI_CTX_ID_NONE = 0,
diff --git a/amiga/download.c b/amiga/download.c
index faa71dbc8..fc58bd48e 100644
--- a/amiga/download.c
+++ b/amiga/download.c
@@ -42,6 +42,7 @@
 #include <reaction/reaction_macros.h>
 
 #include "utils/errors.h"
+#include "utils/nsurl.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
diff --git a/amiga/dt_anim.c b/amiga/dt_anim.c
index e09613960..a3bfb1d66 100644
--- a/amiga/dt_anim.c
+++ b/amiga/dt_anim.c
@@ -23,6 +23,7 @@
 #ifdef WITH_AMIGA_DATATYPES
 #include "amiga/os3support.h"
 
+#include <stdlib.h>
 #include <proto/datatypes.h>
 #include <proto/dos.h>
 #include <proto/exec.h>
diff --git a/amiga/dt_picture.c b/amiga/dt_picture.c
index 2452c5160..aa2418dca 100644
--- a/amiga/dt_picture.c
+++ b/amiga/dt_picture.c
@@ -24,6 +24,7 @@
 #include "amiga/os3support.h"
 
 #include <stdbool.h>
+#include <stdlib.h>
 #include <proto/datatypes.h>
 #include <proto/dos.h>
 #include <proto/intuition.h>
diff --git a/amiga/file.c b/amiga/file.c
index d26b4be49..267ebae5a 100644
--- a/amiga/file.c
+++ b/amiga/file.c
@@ -22,9 +22,11 @@
 #include <proto/icon.h>
 #include <workbench/icon.h>
 
+#include "utils/utils.h"
 #include "utils/nsoption.h"
 #include "utils/file.h"
 #include "utils/messages.h"
+#include "content/hlcache.h"
 #include "content/content.h"
 #include "content/fetch.h"
 #include "desktop/browser.h"
diff --git a/amiga/font_cache.c b/amiga/font_cache.c
index e3f107dd8..ea285730a 100644
--- a/amiga/font_cache.c
+++ b/amiga/font_cache.c
@@ -69,7 +69,7 @@ static void ami_font_cache_cleanup(struct SkipList *skiplist)
 		SubTime(&curtime, &node->lastused);
 		if(curtime.Seconds > 300)
 		{
-			LOG("Freeing font %lx not used for %ld seconds", node->skip_node.sn_Key, curtime.Seconds);
+			LOG("Freeing font %p not used for %ld seconds", node->skip_node.sn_Key, curtime.Seconds);
 			ami_font_bullet_close(node);
 			RemoveSkipNode(skiplist, node->skip_node.sn_Key);
 		}
diff --git a/amiga/font_diskfont.c b/amiga/font_diskfont.c
index 6beae57ff..6ad6e79c4 100644
--- a/amiga/font_diskfont.c
+++ b/amiga/font_diskfont.c
@@ -18,6 +18,8 @@
 
 #include "amiga/os3support.h"
 
+#include <stdlib.h>
+#include <string.h>
 #include <proto/diskfont.h>
 #include <proto/exec.h>
 #include <proto/graphics.h>
diff --git a/amiga/gui.c b/amiga/gui.c
index 26d8509e2..d2563084e 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -95,6 +95,7 @@
 #include "utils/utils.h"
 #include "utils/nsurl.h"
 #include "utils/file.h"
+#include "content/hlcache.h"
 #include "content/backing_store.h"
 #include "content/fetchers.h"
 #include "content/fetchers/resource.h"
diff --git a/amiga/gui.h b/amiga/gui.h
index 172a858d9..d301ac574 100644
--- a/amiga/gui.h
+++ b/amiga/gui.h
@@ -18,16 +18,20 @@
 
 #ifndef AMIGA_GUI_H
 #define AMIGA_GUI_H
+
 #include <stdbool.h>
 #include <graphics/rastport.h>
 #include <intuition/classusr.h>
 #include <dos/dos.h>
 #include <devices/inputevent.h>
+
+#include "desktop/gui_window.h"
+#include "desktop/mouse.h"
+
 #include "amiga/menu.h"
 #include "amiga/object.h"
 #include "amiga/os3support.h"
 #include "amiga/plotters.h"
-#include "desktop/gui_window.h"
 
 #ifdef __amigaos4__
 #define HOOKF(ret,func,type,ptr,msgtype) static ret func(struct Hook *hook, type ptr, msgtype msg)
@@ -158,7 +162,7 @@ struct gui_window
 	int scrolly;
 	struct history_window *hw;
 	struct List dllist;
-	hlcache_handle *favicon;
+	struct hlcache_handle *favicon;
 	bool throbbing;
 	char *tabtitle;
 	APTR deferred_rects_pool;
@@ -183,7 +187,7 @@ void ami_gui_tabs_toggle_all(void);
 bool ami_locate_resource(char *fullpath, const char *file);
 void ami_gui_update_hotlist_button(struct gui_window_2 *gwin);
 nserror ami_gui_new_blank_tab(struct gui_window_2 *gwin);
-char *ami_gui_get_cache_favicon_name(nsurl *url, bool only_if_avail);
+char *ami_gui_get_cache_favicon_name(struct nsurl *url, bool only_if_avail);
 int ami_gui_count_windows(int window, int *tabs);
 void ami_gui_set_scale(struct gui_window *gw, float scale);
 
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index 3be0cd55f..4ac5464e3 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -18,6 +18,7 @@
 
 #include <stdbool.h>
 #include <string.h>
+#include <stdlib.h>
 #include <proto/exec.h>
 #include <proto/intuition.h>
 #include <proto/utility.h>
@@ -57,6 +58,7 @@
 #include <reaction/reaction.h>
 #include <reaction/reaction_macros.h>
 
+#include "utils/nsurl.h"
 #include "utils/messages.h"
 #include "utils/nsoption.h"
 #include "desktop/browser.h"
diff --git a/amiga/login.c b/amiga/login.c
index 4cf9ba8bf..a4c0d62bb 100755
--- a/amiga/login.c
+++ b/amiga/login.c
@@ -20,6 +20,7 @@
 
 #include <assert.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <proto/exec.h>
 #include <proto/intuition.h>
diff --git a/amiga/menu.c b/amiga/menu.c
index f851e441c..e2dc414aa 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -19,6 +19,7 @@
 #include "amiga/os3support.h"
 
 #include <string.h>
+#include <stdlib.h>
 
 #include <proto/dos.h>
 #include <proto/asl.h>
@@ -44,7 +45,9 @@
 #include "utils/nsoption.h"
 #include "utils/messages.h"
 #include "utils/log.h"
-
+#include "utils/utils.h"
+#include "utils/nsurl.h"
+#include "content/hlcache.h"
 #include "desktop/hotlist.h"
 #include "desktop/browser.h"
 #include "desktop/mouse.h"
diff --git a/amiga/menu.h b/amiga/menu.h
index cff42ddc4..3bec113d0 100755
--- a/amiga/menu.h
+++ b/amiga/menu.h
@@ -18,18 +18,20 @@
 
 #ifndef AMIGA_MENU_H
 #define AMIGA_MENU_H
+
 #include <exec/types.h>
 #include <intuition/intuition.h>
 #include <libraries/gadtools.h>
-#include "content/hlcache.h"
 
-/* Maximum number of hotlist items (somewhat arbitrary value) */
+struct hlcache_handle;
+
+/** Maximum number of hotlist items (somewhat arbitrary value) */
 #define AMI_HOTLIST_ITEMS 60
 
-/* Maximum number of ARexx menu items (somewhat arbitrary value) */
+/** Maximum number of ARexx menu items (somewhat arbitrary value) */
 #define AMI_MENU_AREXX_ITEMS 20
 
-/* enum menu structure, has to be here as we need it below. */
+/** enum menu structure, has to be here as we need it below. */
 enum {
 	/* Project menu */
 	M_PROJECT = 0,
@@ -127,7 +129,7 @@ enum {
 #define AMI_MENU_BACKIMG FULLMENUNUM(2,8,1)
 #define AMI_MENU_JS FULLMENUNUM(2,9,0)
 
-/* A special value for ami_menu_window_close */
+/** A special value for ami_menu_window_close */
 #define AMI_MENU_WINDOW_CLOSE_ALL (void *)1
 
 struct gui_window;
@@ -140,7 +142,7 @@ void ami_free_menulabs(struct gui_window_2 *gwin);
 struct Menu *ami_menu_create(struct gui_window_2 *gwin);
 void ami_menu_refresh(struct gui_window_2 *gwin);
 void ami_menu_update_checked(struct gui_window_2 *gwin);
-void ami_menu_update_disabled(struct gui_window *g, hlcache_handle *c);
+void ami_menu_update_disabled(struct gui_window *g, struct hlcache_handle *c);
 void ami_menu_free_glyphs(void);
 void ami_menu_free(struct gui_window_2 *gwin);
 
diff --git a/amiga/misc.c b/amiga/misc.c
index 7eb103964..ae91bf3b2 100755
--- a/amiga/misc.c
+++ b/amiga/misc.c
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <string.h>
 #include <sys/stat.h>
 
 #include <proto/dos.h>
@@ -31,6 +32,7 @@
 #include "utils/log.h"
 #include "utils/file.h"
 #include "utils/messages.h"
+#include "utils/nsurl.h"
 #include "utils/url.h"
 
 #include "desktop/gui_window.h"
diff --git a/amiga/plugin_hack.c b/amiga/plugin_hack.c
index 68fc57077..21f4da142 100644
--- a/amiga/plugin_hack.c
+++ b/amiga/plugin_hack.c
@@ -22,6 +22,8 @@
 
 #include "amiga/os3support.h"
 
+#include <stdlib.h>
+
 #include "amiga/filetype.h"
 #include "amiga/plugin_hack.h"
 #include "content/content_protected.h"
diff --git a/amiga/print.c b/amiga/print.c
index 84cca8fac..72b83e8e3 100644
--- a/amiga/print.c
+++ b/amiga/print.c
@@ -18,6 +18,7 @@
 
 #include "amiga/os3support.h"
 
+#include <string.h>
 #include <proto/utility.h>
 #include <proto/iffparse.h>
 #include <proto/dos.h>
@@ -52,6 +53,7 @@
 #include "desktop/font.h"
 #include "desktop/mouse.h"
 #include "desktop/gui_window.h"
+#include "content/hlcache.h"
 
 #include "amiga/plotters.h"
 #include "amiga/gui.h"
-- 
cgit v1.2.3