--- configure.orig 2017-11-15 21:01:06.000000000 -0600
+++ configure 2017-11-22 21:47:59.000000000 -0600
presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
-if test x$ac_cv_c_bigendian = xuniversal ; then
- as_fn_error $? "Universal builds not supported: see https://bugzilla.gnome.org/show_bug.cgi?id=742548" "$LINENO" 5
@@ -31038,10 +31035,10 @@
-if test x$glib_cv_va_val_copy = xno; then
glib_vacopy="\$glib_vacopy
-#define G_VA_COPY_AS_ARRAY 1"
+#define G_VA_COPY_AS_ARRAY 1
g_have_gnuc_varargs=$g_have_gnuc_varargs
g_have_iso_c_varargs=$g_have_iso_c_varargs
@@ -32697,18 +32694,32 @@
cat >>$outfile <<_______EOF
#define G_HAVE_GINT64 1 /* deprecated, always true */
-${glib_extension}typedef signed $gint64 gint64;
-${glib_extension}typedef unsigned $gint64 guint64;
+${glib_extension}typedef signed long gint64;
+${glib_extension}typedef unsigned long guint64;
-#define G_GINT64_CONSTANT(val) $gint64_constant
-#define G_GUINT64_CONSTANT(val) $guint64_constant
+#define G_GINT64_CONSTANT(val) (val##L)
+#define G_GUINT64_CONSTANT(val) (val##UL)
+${glib_extension}typedef signed long long gint64;
+${glib_extension}typedef unsigned long long guint64;
+#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL))
+#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))
if test x$gint64_format != x ; then
cat >>$outfile <<_______EOF
-#define G_GINT64_MODIFIER $gint64_modifier
-#define G_GINT64_FORMAT $gint64_format
-#define G_GUINT64_FORMAT $guint64_format
+#define G_GINT64_MODIFIER "l"
+#define G_GINT64_FORMAT "li"
+#define G_GUINT64_FORMAT "lu"
+#define G_GINT64_MODIFIER "ll"
+#define G_GINT64_FORMAT "lli"
+#define G_GUINT64_FORMAT "llu"