From ba4788108b7e5c33920d3cc55b4f378d26233e11 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@netsurf-browser.org>
Date: Thu, 16 Jan 2014 14:43:48 +0000
Subject: fixup amiga build errors

---
 amiga/clipboard.c |  9 ++++++++-
 amiga/clipboard.h |  6 +++---
 amiga/download.c  | 30 +++++++++++++++---------------
 amiga/gui.c       | 12 +++++++-----
 amiga/sslcert.h   |  1 +
 5 files changed, 34 insertions(+), 24 deletions(-)

(limited to 'amiga')

diff --git a/amiga/clipboard.c b/amiga/clipboard.c
index 18598798c..8df441e02 100644
--- a/amiga/clipboard.c
+++ b/amiga/clipboard.c
@@ -215,7 +215,7 @@ void gui_get_clipboard(char **buffer, size_t *length)
 	CloseIFF(iffh);
 }
 
-void gui_set_clipboard(const char *buffer, size_t length,
+static void gui_set_clipboard(const char *buffer, size_t length,
 	nsclipboard_styles styles[], int n_styles)
 {
 	char *text;
@@ -376,3 +376,10 @@ bool ami_easy_clipboard_svg(struct hlcache_handle *c)
 	return true;
 }
 #endif
+
+static struct gui_clipboard_table clipboard_table = {
+	.get = gui_get_clipboard,
+	.set = gui_set_clipboard,
+};
+
+struct gui_clipboard_table *amiga_clipboard_table = &clipboard_table;
diff --git a/amiga/clipboard.h b/amiga/clipboard.h
index 57004547d..db6fc35cc 100755
--- a/amiga/clipboard.h
+++ b/amiga/clipboard.h
@@ -25,11 +25,11 @@ struct hlcache_handle;
 struct selection;
 struct gui_window;
 struct gui_window_2;
+struct gui_clipboard_table;
 
-void gui_start_selection(struct gui_window *g);
-void gui_get_clipboard(char **buffer, size_t *length);
-void gui_set_clipboard(const char *buffer, size_t length, nsclipboard_styles styles[], int n_styles);
+extern struct gui_clipboard_table *amiga_clipboard_table;
 
+void gui_start_selection(struct gui_window *g);
 
 void ami_clipboard_init(void);
 void ami_clipboard_free(void);
diff --git a/amiga/download.c b/amiga/download.c
index 4f4c39b20..a65fad99f 100644
--- a/amiga/download.c
+++ b/amiga/download.c
@@ -227,21 +227,6 @@ static nserror gui_download_window_data(struct gui_download_window *dw,
 	return NSERROR_OK;
 }
 
-static void gui_download_window_error(struct gui_download_window *dw,
-		const char *error_msg)
-{
-	warn_user("Unwritten","");
-	dw->result = AMINS_DLOAD_ERROR;
-	gui_download_window_done(dw);
-}
-
-void ami_download_window_abort(struct gui_download_window *dw)
-{
-	download_context_abort(dw->ctx);
-	dw->result = AMINS_DLOAD_ABORT;
-	gui_download_window_done(dw);
-}
-
 static void gui_download_window_done(struct gui_download_window *dw)
 {
 	struct dlnode *dln,*dln2 = NULL;
@@ -299,6 +284,21 @@ static void gui_download_window_done(struct gui_download_window *dw)
 	}
 }
 
+static void gui_download_window_error(struct gui_download_window *dw,
+		const char *error_msg)
+{
+	warn_user("Unwritten","");
+	dw->result = AMINS_DLOAD_ERROR;
+	gui_download_window_done(dw);
+}
+
+void ami_download_window_abort(struct gui_download_window *dw)
+{
+	download_context_abort(dw->ctx);
+	dw->result = AMINS_DLOAD_ABORT;
+	gui_download_window_done(dw);
+}
+
 BOOL ami_download_window_event(struct gui_download_window *dw)
 {
 	/* return TRUE if window destroyed */
diff --git a/amiga/gui.c b/amiga/gui.c
index ad172207b..554f4eb6a 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -69,6 +69,7 @@
 #include "amiga/theme.h"
 #include "amiga/tree.h"
 #include "amiga/utf8.h"
+#include "amiga/sslcert.h"
 
 /* Custom StringView class */
 #include "amiga/stringview/stringview.h"
@@ -202,6 +203,11 @@ static void ami_schedule_redraw_remove(struct gui_window_2 *gwin);
 
 static bool gui_window_get_scroll(struct gui_window *g, int *sx, int *sy);
 static void gui_window_set_scroll(struct gui_window *g, int sx, int sy);
+static void gui_window_remove_caret(struct gui_window *g);
+static void gui_set_search_ico(hlcache_handle *ico);
+static void gui_window_place_caret(struct gui_window *g, int x, int y, int height, const struct rect *clip);
+
+
 
 /* accessors for default options - user option is updated if it is set as per default */
 #define nsoption_default_set_int(OPTION, VALUE)				\
@@ -5144,10 +5150,6 @@ static struct gui_window_table amiga_window_table = {
 	.save_link = gui_window_save_link,
 };
 
-static struct gui_clipboard_table amiga_clipboard_table = {
-	.get = gui_get_clipboard,
-	.set = gui_set_clipboard,
-};
 
 static struct gui_browser_table amiga_browser_table = {
 	.poll = gui_poll,
@@ -5176,7 +5178,7 @@ int main(int argc, char** argv)
 	struct gui_table amiga_gui_table = {
 		.browser = &amiga_browser_table,
 		.window = &amiga_window_table,
-		.clipboard = &amiga_clipboard_table,
+		.clipboard = amiga_clipboard_table,
 		.download = amiga_download_table,
 	};
 
diff --git a/amiga/sslcert.h b/amiga/sslcert.h
index b55cac8b6..953142e98 100644
--- a/amiga/sslcert.h
+++ b/amiga/sslcert.h
@@ -24,4 +24,5 @@ void gui_cert_verify(nsurl *url,
 		     nserror (*cb)(bool proceed, void *pw), void *cbpw);
 
 void ami_ssl_free(struct treeview_window *twin);
+
 #endif
-- 
cgit v1.2.3