forked from gstf/libspatialite-ios
-
Notifications
You must be signed in to change notification settings - Fork 1
/
spatialite.patch
48 lines (47 loc) · 1.7 KB
/
spatialite.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
diff -rupN spatialite/src/gaiaaux/gg_utf8.c spatialite-ios/src/gaiaaux/gg_utf8.c
--- spatialite/src/gaiaaux/gg_utf8.c 2012-11-25 12:47:00.000000000 +0100
+++ spatialite-ios/src/gaiaaux/gg_utf8.c 2013-02-20 16:58:56.000000000 +0100
@@ -71,7 +71,7 @@ extern const char *locale_charset (void)
#else /* not MINGW32 - WIN32 */
#if defined(__APPLE__) || defined(__ANDROID__)
#include <iconv.h>
-#include <localcharset.h>
+#include <langinfo.h>
#else /* neither Mac OsX nor Android */
#include <iconv.h>
#include <langinfo.h>
@@ -85,15 +85,15 @@ GAIAAUX_DECLARE const char *
gaiaGetLocaleCharset ()
{
/* identifies the locale charset */
-#if defined(__MINGW32__) || defined(_WIN32)
- return locale_charset ();
-#else /* not MINGW32 - WIN32 */
-#if defined(__APPLE__) || defined(__ANDROID__)
- return locale_charset ();
-#else /* neither Mac OsX nor Android */
+// #if defined(__MINGW32__) || defined(_WIN32)
+// return locale_charset ();
+// #else /* not MINGW32 - WIN32 */
+// #if defined(__APPLE__) || defined(__ANDROID__)
+// return locale_charset ();
+// #else /* neither Mac OsX nor Android */
return nl_langinfo (CODESET);
-#endif
-#endif
+// #endif
+// #endif
}
GAIAAUX_DECLARE int
diff -rupN spatialite/src/gaiageo/gg_shape.c spatialite-ios/src/gaiageo/gg_shape.c
--- spatialite/src/gaiageo/gg_shape.c 2012-11-25 12:47:00.000000000 +0100
+++ spatialite-ios/src/gaiageo/gg_shape.c 2013-02-20 16:59:01.000000000 +0100
@@ -73,7 +73,7 @@ extern const char *locale_charset (void)
#else /* not MINGW32 */
#if defined(__APPLE__) || defined(__ANDROID__)
#include <iconv.h>
-#include <localcharset.h>
+//#include <localcharset.h>
#else /* neither Mac OsX nor Android */
#include <iconv.h>
#include <langinfo.h>