Merge master

[netatalk.git] / libatalk / unicode / iconv.c

diff --git a/libatalk/unicode/iconv.c b/libatalk/unicode/iconv.c
index 2ca2ec01e68e0ba650d7abd56837083bafb9a86c..7c5eb67e3ce0ddd653696ef014d657d324e07c15 100644 (file)
--- a/libatalk/unicode/iconv.c
+++ b/libatalk/unicode/iconv.c
@@ -39,8 +39,8 @@
 #ifdef HAVE_USABLE_ICONV
 #include <iconv.h>
 #endif
+#include <arpa/inet.h>
 
-#include <netatalk/endian.h>
 #include <atalk/unicode.h>
 #include <atalk/logger.h>
 #include "byteorder.h"
@@ -107,7 +107,6 @@ extern  struct charset_functions charset_mac_chinese_simp;
 static struct charset_functions builtin_functions[] = {
        {"UCS-2",   0, iconv_copy, iconv_copy, CHARSET_WIDECHAR | CHARSET_PRECOMPOSED, NULL, NULL, NULL},
        {"ASCII",     0, ascii_pull, ascii_push, CHARSET_MULTIBYTE | CHARSET_PRECOMPOSED, NULL, NULL, NULL},
-       {"SHIFT_JIS", 1568, NULL, NULL, CHARSET_ICONV | CHARSET_PRECOMPOSED | CHARSET_CLIENT, NULL, NULL, NULL},
        {NULL, 0, NULL, NULL, 0, NULL, NULL, NULL}
 };
 
@@ -158,7 +157,7 @@ int atalk_register_charset(struct charset_functions *funcs)
        return 0;
 }
 
-void lazy_initialize_iconv(void)
+static void lazy_initialize_iconv(void)
 {
        static int initialized = 0;
        int i;