android: make the config be compatible with 64-bit platform

diff --git a/Android.mk b/Android.mk
index c455f97..5053e7d 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1 @@
-LOCAL_PATH := $(call my-dir)
-
 include $(call all-subdir-makefiles)

diff --git a/config.h b/config.h
index 61d4692..14bed28 100644 (file)
--- a/config.h
+++ b/config.h
@@ -647,25 +647,25 @@
 /* #undef SANE_MALLOC_PROTOS */
 
 /* The size of `char', as computed by sizeof. */
-#define SIZEOF_CHAR 1
+#define SIZEOF_CHAR (sizeof(char))
 
 /* The size of `int', as computed by sizeof. */
-#define SIZEOF_INT 4
+#define SIZEOF_INT (sizeof(int))
 
 /* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
+#define SIZEOF_LONG (sizeof(long))
 
 /* The size of `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG 8
+#define SIZEOF_LONG_LONG (sizeof(long long))
 
 /* The size of `short', as computed by sizeof. */
-#define SIZEOF_SHORT 2
+#define SIZEOF_SHORT (sizeof(short))
 
 /* The size of `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T 4
+#define SIZEOF_SIZE_T (sizeof(size_t))
 
 /* The size of `void *', as computed by sizeof. */
-#define SIZEOF_VOID_P 4
+#define SIZEOF_VOID_P (sizeof(void *))
 
 /* The size of `__int64', as computed by sizeof. */
 #define SIZEOF___INT64 0

diff --git a/glib/Android.mk b/glib/Android.mk
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/glibconfig.h b/glibconfig.h
index efa5b9b..3e666d6 100644 (file)
--- a/glibconfig.h
+++ b/glibconfig.h
@@ -58,12 +58,18 @@ G_GNUC_EXTENSION typedef unsigned long long guint64;
 #define G_GINT64_FORMAT "lli"
 #define G_GUINT64_FORMAT "llu"
 
+#ifdef __LP64__
+#define GLIB_SIZEOF_VOID_P 8
+#define GLIB_SIZEOF_LONG   8
+#define GLIB_SIZEOF_SIZE_T 8
+#else
 #define GLIB_SIZEOF_VOID_P 4
 #define GLIB_SIZEOF_LONG   4
 #define GLIB_SIZEOF_SIZE_T 4
+#endif
 
-typedef signed int gssize;
-typedef unsigned int gsize;
+typedef signed long gssize;
+typedef unsigned long gsize;
 #define G_GSIZE_MODIFIER ""
 #define G_GSSIZE_FORMAT "i"
 #define G_GSIZE_FORMAT "u"
@@ -81,14 +87,14 @@ typedef gint64 goffset;
 #define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val)
 
 
-#define GPOINTER_TO_INT(p)     ((gint)  (gint) (p))
-#define GPOINTER_TO_UINT(p)    ((guint) (guint) (p))
+#define GPOINTER_TO_INT(p)     ((gint)  (glong) (p))
+#define GPOINTER_TO_UINT(p)    ((guint) (gulong) (p))
 
-#define GINT_TO_POINTER(i)     ((gpointer) (gint) (i))
-#define GUINT_TO_POINTER(u)    ((gpointer) (guint) (u))
+#define GINT_TO_POINTER(i)     ((gpointer) (glong) (i))
+#define GUINT_TO_POINTER(u)    ((gpointer) (gulong) (u))
 
-typedef signed int gintptr;
-typedef unsigned int guintptr;
+typedef signed long gintptr;
+typedef unsigned long guintptr;
 
 #define G_GINTPTR_MODIFIER      ""
 #define G_GINTPTR_FORMAT        "i"
@@ -169,18 +175,25 @@ typedef unsigned int guintptr;
 #define GUINT64_TO_LE(val)     ((guint64) (val))
 #define GINT64_TO_BE(val)      ((gint64) GUINT64_SWAP_LE_BE (val))
 #define GUINT64_TO_BE(val)     (GUINT64_SWAP_LE_BE (val))
-#define GLONG_TO_LE(val)       ((glong) GINT32_TO_LE (val))
-#define GULONG_TO_LE(val)      ((gulong) GUINT32_TO_LE (val))
-#define GLONG_TO_BE(val)       ((glong) GINT32_TO_BE (val))
-#define GULONG_TO_BE(val)      ((gulong) GUINT32_TO_BE (val))
+#define GLONG_TO_LE(val)       ((glong) (val))
+#define GULONG_TO_LE(val)      ((gulong) (val))
 #define GINT_TO_LE(val)                ((gint) GINT32_TO_LE (val))
 #define GUINT_TO_LE(val)       ((guint) GUINT32_TO_LE (val))
 #define GINT_TO_BE(val)                ((gint) GINT32_TO_BE (val))
 #define GUINT_TO_BE(val)       ((guint) GUINT32_TO_BE (val))
-#define GSIZE_TO_LE(val)       ((gsize) GUINT32_TO_LE (val))
-#define GSSIZE_TO_LE(val)      ((gssize) GINT32_TO_LE (val))
+#define GSIZE_TO_LE(val)       ((gsize) (val))
+#define GSSIZE_TO_LE(val)      ((gssize) (val))
+#ifdef __LP64__
+#define GLONG_TO_BE(val)       ((glong) GINT64_TO_BE (val))
+#define GULONG_TO_BE(val)      ((gulong) GUINT64_TO_BE (val))
+#define GSIZE_TO_BE(val)       ((gsize) GUINT64_TO_BE (val))
+#define GSSIZE_TO_BE(val)      ((gssize) GINT64_TO_BE (val))
+#else
+#define GLONG_TO_BE(val)       ((glong) GINT32_TO_BE (val))
+#define GULONG_TO_BE(val)      ((gulong) GUINT32_TO_BE (val))
 #define GSIZE_TO_BE(val)       ((gsize) GUINT32_TO_BE (val))
 #define GSSIZE_TO_BE(val)      ((gssize) GINT32_TO_BE (val))
+#endif
 #define G_BYTE_ORDER G_LITTLE_ENDIAN
 
 #define GLIB_SYSDEF_POLLIN =1