summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2011-01-06 23:05:00 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2011-01-06 23:05:00 +0000
commitb5e989487ccf6f44b696f8ef3601e86255c98dbd (patch)
treead9fc5c248acdada137be30aa824b41dba4c51af
parent749dfa52ba697fd01a742393e18ac7f8fa4521a4 (diff)
downloadnetsurf-b5e989487ccf6f44b696f8ef3601e86255c98dbd.tar.gz
netsurf-b5e989487ccf6f44b696f8ef3601e86255c98dbd.tar.bz2
AmigaOS 3 support
svn path=/trunk/netsurf/; revision=11229
-rwxr-xr-xamiga/utf8.c34
1 files 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);
+}
+
+