--- glib/configure.orig 2017-03-19 09:57:03.000000000 -0500
+++ glib/configure 2017-03-23 09:18:26.000000000 -0500
GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
-ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
+ABS_GLIB_RUNTIME_LIBDIR="`readlink $libdir/$with_runtime_libdir`"
if test "x$with_runtime_libdir" != "x"; then
@@ -28171,10 +28171,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
if test x$glib_cv_hasinline = xyes; then
glib_inline='#define G_HAVE_INLINE 1'
@@ -29779,18 +29779,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"