Merge branch 'master' of git://github.com/relan/exfat into marshmallow-x86

[android-x86/external-exfat.git] / libexfat / exfat.h

diff --git a/libexfat/exfat.h b/libexfat/exfat.h
index 21b760e..240cde1 100644 (file)
--- a/libexfat/exfat.h
+++ b/libexfat/exfat.h
@@ -24,7 +24,11 @@
 #ifndef EXFAT_H_INCLUDED
 #define EXFAT_H_INCLUDED
 
+#if defined(__ANDROID__)
+#include "android_config.h"
+#else
 #include "config.h"
+#endif
 #include "compiler.h"
 #include "exfatfs.h"
 #include <stdio.h>
@@ -194,12 +198,6 @@ void exfat_humanize_bytes(uint64_t value, struct exfat_human_bytes* hb);
 void exfat_print_info(const struct exfat_super_block* sb,
                uint32_t free_clusters);
 
-int utf16_to_utf8(char* output, const le16_t* input, size_t outsize,
-               size_t insize);
-int utf8_to_utf16(le16_t* output, const char* input, size_t outsize,
-               size_t insize);
-size_t utf16_length(const le16_t* str);
-
 struct exfat_node* exfat_get_node(struct exfat_node* node);
 void exfat_put_node(struct exfat* ef, struct exfat_node* node);
 int exfat_cleanup_node(struct exfat* ef, struct exfat_node* node);