From b5e989487ccf6f44b696f8ef3601e86255c98dbd Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Thu, 6 Jan 2011 23:05:00 +0000
Subject: AmigaOS 3 support

svn path=/trunk/netsurf/; revision=11229
---
 amiga/utf8.c | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/amiga/utf8.c b/amiga/utf8.c
index 98b465c47..55ee6d539 100755
--- a/amiga/utf8.c
+++ b/amiga/utf8.c
@@ -24,18 +24,6 @@
 #include <proto/diskfont.h>
 #include <diskfont/diskfonttag.h>
 
-utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len,
-	char **result)
-{
-	LONG charset;
-	char *encname;
-
-	charset = GetDiskFontCtrl(DFCTRL_CHARSET);
-	encname = ObtainCharsetInfo(DFCS_NUMBER, charset, DFCS_MIMENAME);
-
-	return utf8_to_enc(string,encname,len,result);
-}
-
 void ami_utf8_free(char *ptr)
 {
 	if(ptr) free(ptr);
@@ -72,11 +60,31 @@ char *ami_to_utf8_easy(char *string)
 utf8_convert_ret utf8_from_local_encoding(const char *string, size_t len,
 	char **result)
 {
+	const char *encname = "ISO-8859-1";
+
+#ifdef __amigaos4__
 	LONG charset;
-	char *encname;
 
 	charset = GetDiskFontCtrl(DFCTRL_CHARSET);
 	encname = ObtainCharsetInfo(DFCS_NUMBER, charset, DFCS_MIMENAME);
+#endif
 	
 	return utf8_from_enc(string,encname,len,result);
 }
+
+utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len,
+	char **result)
+{
+	const char *encname = "ISO-8859-1";
+
+#ifdef __amigaos4__
+	LONG charset;
+
+	charset = GetDiskFontCtrl(DFCTRL_CHARSET);
+	encname = ObtainCharsetInfo(DFCS_NUMBER, charset, DFCS_MIMENAME);
+#endif
+
+	return utf8_to_enc(string,encname,len,result);
+}
+
+
-- 
cgit v1.2.3