diff options
| author | Ethan Morgan <ethan@gweithio.com> | 2026-02-14 16:44:06 +0000 |
|---|---|---|
| committer | Ethan Morgan <ethan@gweithio.com> | 2026-02-14 16:44:06 +0000 |
| commit | 54409423f767d8b1cf30cb7d0efca6b4ca138823 (patch) | |
| tree | d915ac7828703ce4b963efdd9728a1777ba18c1e /vcpkg/ports/freexl/android-builtin-iconv.diff | |
Diffstat (limited to 'vcpkg/ports/freexl/android-builtin-iconv.diff')
| -rw-r--r-- | vcpkg/ports/freexl/android-builtin-iconv.diff | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/vcpkg/ports/freexl/android-builtin-iconv.diff b/vcpkg/ports/freexl/android-builtin-iconv.diff new file mode 100644 index 0000000..7ffc4a5 --- /dev/null +++ b/vcpkg/ports/freexl/android-builtin-iconv.diff @@ -0,0 +1,39 @@ +diff --git a/src/freexl.c b/src/freexl.c +index f73021d..cc76d63 100644 +--- a/src/freexl.c ++++ b/src/freexl.c +@@ -61,7 +61,7 @@ extern const char *locale_charset (void); + #include <localcharset.h> + #endif /* end localcharset */ + #else /* not WINDOWS */ +-#if defined(__APPLE__) || defined(__ANDROID__) ++#if defined(__APPLE__) || (defined(__ANDROID__) && __ANDROID_API__ < 28) + #include <iconv.h> + #include <localcharset.h> + #else /* neither Mac OsX nor Android */ +diff --git a/src/freexl_ods.c b/src/freexl_ods.c +index 07265eb..ec29b51 100644 +--- a/src/freexl_ods.c ++++ b/src/freexl_ods.c +@@ -61,7 +61,7 @@ extern const char *locale_charset (void); + #include <localcharset.h> + #endif /* end localcharset */ + #else /* not WINDOWS */ +-#if defined(__APPLE__) || defined(__ANDROID__) ++#if defined(__APPLE__) || (defined(__ANDROID__) && __ANDROID_API__ < 28) + #include <iconv.h> + #include <localcharset.h> + #else /* neither Mac OsX nor Android */ +diff --git a/src/freexl_xlsx.c b/src/freexl_xlsx.c +index dc8891d..de56436 100644 +--- a/src/freexl_xlsx.c ++++ b/src/freexl_xlsx.c +@@ -62,7 +62,7 @@ extern const char *locale_charset (void); + #include <localcharset.h> + #endif /* end localcharset */ + #else /* not WINDOWS */ +-#if defined(__APPLE__) || defined(__ANDROID__) ++#if defined(__APPLE__) || (defined(__ANDROID__) && __ANDROID_API__ < 28) + #include <iconv.h> + #include <localcharset.h> + #else /* neither Mac OsX nor Android */ |