4 files changed, 58 insertions, 3 deletions
diff --git a/amiga/font_bullet.h b/amiga/font_bullet.h
new file mode 100644
index 000000000..1ab9582db
--- /dev/null
+++ b/amiga/font_bullet.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2016 Chris Young <chris@unsatisfactorysoftware.co.uk>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef AMIGA_FONT_BULLET_H
+#define AMIGA_FONT_BULLET_H
+struct ami_font_cache_node;
+
+void ami_font_bullet_init(void);
+void ami_font_bullet_fini(void);
+void ami_font_bullet_close(void *nso);
+
+/* Alternate entry points into font_scan */
+void ami_font_initscanner(bool force, bool save);
+void ami_font_finiscanner(void);
+void ami_font_savescanner(void);
+#endif
+
diff --git a/amiga/font_diskfont.c b/amiga/font_diskfont.c
index e1a62447d..61f777355 100644
--- a/amiga/font_diskfont.c
+++ b/amiga/font_diskfont.c
@@ -123,7 +123,7 @@ static bool amiga_bm_nsfont_width(const plot_font_style_t *fstyle,
 		return false;
 	}
 
-	*width = (int)TextLength(glob->rp, localtext, (UWORD)strlen(localtext));
+	*width = TextLength(glob->rp, localtext, (UWORD)strlen(localtext));
 	free(localtext);
 
 	ami_font_bm_close(bmfont);
@@ -238,7 +238,7 @@ static bool amiga_bm_nsfont_split(const plot_font_style_t *fstyle,
 	}
 	
 	if((co > 0) && (co < strlen(localtext))) {
-		*actual_x = (int)TextLength(glob->rp, localtext, co);
+		*actual_x = TextLength(glob->rp, localtext, co);
 		*char_offset = ami_font_bm_convert_local_to_utf8_offset(string, length, co);
 	} else {
 		*actual_x = x;
diff --git a/amiga/font_diskfont.h b/amiga/font_diskfont.h
new file mode 100644
index 000000000..de19e940e
--- /dev/null
+++ b/amiga/font_diskfont.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2016 Chris Young <chris@unsatisfactorysoftware.co.uk>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef AMIGA_FONT_DISKFONT_H
+#define AMIGA_FONT_DISKFONT_H
+void ami_font_diskfont_init(void);
+#endif
+
diff --git a/amiga/options.h b/amiga/options.h
index 6214c702d..661fc6747 100644
--- a/amiga/options.h
+++ b/amiga/options.h
@@ -63,7 +63,7 @@ NSOPTION_STRING(font_surrogate, NULL)
 NSOPTION_STRING(font_unicode_file, NULL)
 NSOPTION_BOOL(font_unicode_only, false)
 NSOPTION_BOOL(font_antialiasing, true)
-NSOPTION_BOOL(bitmap_fonts,	false)
+NSOPTION_BOOL(bitmap_fonts, false)
 NSOPTION_BOOL(drag_save_icons, true)
 NSOPTION_INTEGER(hotlist_window_xpos, 0)
 NSOPTION_INTEGER(hotlist_window_ypos, 0)