| 修订版 | 43b201bd2865131f849c0fdb58efc830de69aa7a (tree) |
|---|---|
| 时间 | 2015-08-27 01:43:32 |
| 作者 | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
android: make the config be compatible with 64-bit platform
Android.mk (diff)
config.h (diff) glib/Android.mk (diff) glibconfig.h (diff)| @@ -1,3 +1 @@ | ||
| 1 | -LOCAL_PATH := $(call my-dir) | |
| 2 | - | |
| 3 | 1 | include $(call all-subdir-makefiles) |
| @@ -647,25 +647,25 @@ | ||
| 647 | 647 | /* #undef SANE_MALLOC_PROTOS */ |
| 648 | 648 | |
| 649 | 649 | /* The size of `char', as computed by sizeof. */ |
| 650 | -#define SIZEOF_CHAR 1 | |
| 650 | +#define SIZEOF_CHAR (sizeof(char)) | |
| 651 | 651 | |
| 652 | 652 | /* The size of `int', as computed by sizeof. */ |
| 653 | -#define SIZEOF_INT 4 | |
| 653 | +#define SIZEOF_INT (sizeof(int)) | |
| 654 | 654 | |
| 655 | 655 | /* The size of `long', as computed by sizeof. */ |
| 656 | -#define SIZEOF_LONG 4 | |
| 656 | +#define SIZEOF_LONG (sizeof(long)) | |
| 657 | 657 | |
| 658 | 658 | /* The size of `long long', as computed by sizeof. */ |
| 659 | -#define SIZEOF_LONG_LONG 8 | |
| 659 | +#define SIZEOF_LONG_LONG (sizeof(long long)) | |
| 660 | 660 | |
| 661 | 661 | /* The size of `short', as computed by sizeof. */ |
| 662 | -#define SIZEOF_SHORT 2 | |
| 662 | +#define SIZEOF_SHORT (sizeof(short)) | |
| 663 | 663 | |
| 664 | 664 | /* The size of `size_t', as computed by sizeof. */ |
| 665 | -#define SIZEOF_SIZE_T 4 | |
| 665 | +#define SIZEOF_SIZE_T (sizeof(size_t)) | |
| 666 | 666 | |
| 667 | 667 | /* The size of `void *', as computed by sizeof. */ |
| 668 | -#define SIZEOF_VOID_P 4 | |
| 668 | +#define SIZEOF_VOID_P (sizeof(void *)) | |
| 669 | 669 | |
| 670 | 670 | /* The size of `__int64', as computed by sizeof. */ |
| 671 | 671 | #define SIZEOF___INT64 0 |
| @@ -58,12 +58,18 @@ G_GNUC_EXTENSION typedef unsigned long long guint64; | ||
| 58 | 58 | #define G_GINT64_FORMAT "lli" |
| 59 | 59 | #define G_GUINT64_FORMAT "llu" |
| 60 | 60 | |
| 61 | +#ifdef __LP64__ | |
| 62 | +#define GLIB_SIZEOF_VOID_P 8 | |
| 63 | +#define GLIB_SIZEOF_LONG 8 | |
| 64 | +#define GLIB_SIZEOF_SIZE_T 8 | |
| 65 | +#else | |
| 61 | 66 | #define GLIB_SIZEOF_VOID_P 4 |
| 62 | 67 | #define GLIB_SIZEOF_LONG 4 |
| 63 | 68 | #define GLIB_SIZEOF_SIZE_T 4 |
| 69 | +#endif | |
| 64 | 70 | |
| 65 | -typedef signed int gssize; | |
| 66 | -typedef unsigned int gsize; | |
| 71 | +typedef signed long gssize; | |
| 72 | +typedef unsigned long gsize; | |
| 67 | 73 | #define G_GSIZE_MODIFIER "" |
| 68 | 74 | #define G_GSSIZE_FORMAT "i" |
| 69 | 75 | #define G_GSIZE_FORMAT "u" |
| @@ -81,14 +87,14 @@ typedef gint64 goffset; | ||
| 81 | 87 | #define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val) |
| 82 | 88 | |
| 83 | 89 | |
| 84 | -#define GPOINTER_TO_INT(p) ((gint) (gint) (p)) | |
| 85 | -#define GPOINTER_TO_UINT(p) ((guint) (guint) (p)) | |
| 90 | +#define GPOINTER_TO_INT(p) ((gint) (glong) (p)) | |
| 91 | +#define GPOINTER_TO_UINT(p) ((guint) (gulong) (p)) | |
| 86 | 92 | |
| 87 | -#define GINT_TO_POINTER(i) ((gpointer) (gint) (i)) | |
| 88 | -#define GUINT_TO_POINTER(u) ((gpointer) (guint) (u)) | |
| 93 | +#define GINT_TO_POINTER(i) ((gpointer) (glong) (i)) | |
| 94 | +#define GUINT_TO_POINTER(u) ((gpointer) (gulong) (u)) | |
| 89 | 95 | |
| 90 | -typedef signed int gintptr; | |
| 91 | -typedef unsigned int guintptr; | |
| 96 | +typedef signed long gintptr; | |
| 97 | +typedef unsigned long guintptr; | |
| 92 | 98 | |
| 93 | 99 | #define G_GINTPTR_MODIFIER "" |
| 94 | 100 | #define G_GINTPTR_FORMAT "i" |
| @@ -169,18 +175,25 @@ typedef unsigned int guintptr; | ||
| 169 | 175 | #define GUINT64_TO_LE(val) ((guint64) (val)) |
| 170 | 176 | #define GINT64_TO_BE(val) ((gint64) GUINT64_SWAP_LE_BE (val)) |
| 171 | 177 | #define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE (val)) |
| 172 | -#define GLONG_TO_LE(val) ((glong) GINT32_TO_LE (val)) | |
| 173 | -#define GULONG_TO_LE(val) ((gulong) GUINT32_TO_LE (val)) | |
| 174 | -#define GLONG_TO_BE(val) ((glong) GINT32_TO_BE (val)) | |
| 175 | -#define GULONG_TO_BE(val) ((gulong) GUINT32_TO_BE (val)) | |
| 178 | +#define GLONG_TO_LE(val) ((glong) (val)) | |
| 179 | +#define GULONG_TO_LE(val) ((gulong) (val)) | |
| 176 | 180 | #define GINT_TO_LE(val) ((gint) GINT32_TO_LE (val)) |
| 177 | 181 | #define GUINT_TO_LE(val) ((guint) GUINT32_TO_LE (val)) |
| 178 | 182 | #define GINT_TO_BE(val) ((gint) GINT32_TO_BE (val)) |
| 179 | 183 | #define GUINT_TO_BE(val) ((guint) GUINT32_TO_BE (val)) |
| 180 | -#define GSIZE_TO_LE(val) ((gsize) GUINT32_TO_LE (val)) | |
| 181 | -#define GSSIZE_TO_LE(val) ((gssize) GINT32_TO_LE (val)) | |
| 184 | +#define GSIZE_TO_LE(val) ((gsize) (val)) | |
| 185 | +#define GSSIZE_TO_LE(val) ((gssize) (val)) | |
| 186 | +#ifdef __LP64__ | |
| 187 | +#define GLONG_TO_BE(val) ((glong) GINT64_TO_BE (val)) | |
| 188 | +#define GULONG_TO_BE(val) ((gulong) GUINT64_TO_BE (val)) | |
| 189 | +#define GSIZE_TO_BE(val) ((gsize) GUINT64_TO_BE (val)) | |
| 190 | +#define GSSIZE_TO_BE(val) ((gssize) GINT64_TO_BE (val)) | |
| 191 | +#else | |
| 192 | +#define GLONG_TO_BE(val) ((glong) GINT32_TO_BE (val)) | |
| 193 | +#define GULONG_TO_BE(val) ((gulong) GUINT32_TO_BE (val)) | |
| 182 | 194 | #define GSIZE_TO_BE(val) ((gsize) GUINT32_TO_BE (val)) |
| 183 | 195 | #define GSSIZE_TO_BE(val) ((gssize) GINT32_TO_BE (val)) |
| 196 | +#endif | |
| 184 | 197 | #define G_BYTE_ORDER G_LITTLE_ENDIAN |
| 185 | 198 | |
| 186 | 199 | #define GLIB_SYSDEF_POLLIN =1 |
Android-x86
Fork