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/libspatialite/android-builtin-iconv.diff | |
Diffstat (limited to 'vcpkg/ports/libspatialite/android-builtin-iconv.diff')
| -rw-r--r-- | vcpkg/ports/libspatialite/android-builtin-iconv.diff | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/vcpkg/ports/libspatialite/android-builtin-iconv.diff b/vcpkg/ports/libspatialite/android-builtin-iconv.diff new file mode 100644 index 0000000..db07926 --- /dev/null +++ b/vcpkg/ports/libspatialite/android-builtin-iconv.diff @@ -0,0 +1,35 @@ +diff --git a/src/gaiaaux/gg_utf8.c b/src/gaiaaux/gg_utf8.c +index f11e604..620696e 100644 +--- a/src/gaiaaux/gg_utf8.c ++++ b/src/gaiaaux/gg_utf8.c +@@ -73,7 +73,7 @@ extern const char *locale_charset (void); + #include <localcharset.h> + #endif /* end localcharset */ + #else /* not MINGW32 - WIN32 */ +-#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 */ +@@ -89,7 +89,7 @@ gaiaGetLocaleCharset () + #if defined(__MINGW32__) || defined(_WIN32) + return locale_charset (); + #else /* not MINGW32 - WIN32 */ +-#if defined(__APPLE__) || defined(__ANDROID__) ++#if defined(__APPLE__) || (defined(__ANDROID__) && __ANDROID_API__ < 28) + return locale_charset (); + #else /* neither Mac OsX nor Android */ + return nl_langinfo (CODESET); +diff --git a/src/gaiageo/gg_shape.c b/src/gaiageo/gg_shape.c +index 8917535..e5e0240 100644 +--- a/src/gaiageo/gg_shape.c ++++ b/src/gaiageo/gg_shape.c +@@ -75,7 +75,7 @@ extern const char *locale_charset (void); + #include <localcharset.h> + #endif /* end localcharset */ + #else /* not MINGW32 */ +-#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 */ |