Ticket #17042: patch-glibconfig.h.diff

glibconfig.h

@@ -49 +49 @@
 #define G_GUINT32_FORMAT "u"
 #define G_HAVE_GINT64 1          /* deprecated, always true */
 
+#ifdef __LP64__
 typedef signed long gint64;
 typedef unsigned long guint64;
+#else
+typedef signed long long gint64;
+typedef unsigned long long guint64;
+#endif
 
+#ifdef __LP64__
 #define G_GINT64_CONSTANT(val)  (val##L)
 #define G_GUINT64_CONSTANT(val) (val##UL)
 #define G_GINT64_MODIFIER "l"
 #define G_GINT64_FORMAT "li"
 #define G_GUINT64_FORMAT "lu"
+#else
+#define G_GINT64_CONSTANT(val)  (val##LL)
+#define G_GUINT64_CONSTANT(val) (val##ULL)
+#define G_GINT64_MODIFIER "ll"
+#define G_GINT64_FORMAT "lli"
+#define G_GUINT64_FORMAT "llu"
+#endif
 
+#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 long gssize;
 typedef unsigned long gsize;