[glib/glib-2-42] Win32: Update Pre-configured Config Headers

[Chun-wei Fan <fanchunwei src gnome org>]

commit 7d8e19483951216e7840d0a5c228e22e86f55bc2
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Jan 7 10:07:25 2015 +0800

    Win32: Update Pre-configured Config Headers
    
    Update glibconfig.h.win32.in so that it will be in-line with the ones that
    are produced with configure.ac, for use on Windows builds.
    
    Thanks to Philip Withnall for pointing out the changes needed in bug
    727829.

 glib/glibconfig.h.win32.in |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/glib/glibconfig.h.win32.in b/glib/glibconfig.h.win32.in
index fc63887..418cbe0 100644
--- a/glib/glibconfig.h.win32.in
+++ b/glib/glibconfig.h.win32.in
@@ -77,8 +77,9 @@ typedef unsigned __int64 guint64;
 typedef signed long long gssize;
 typedef unsigned long long gsize;
 #define G_GSIZE_MODIFIER "I64"
-#define G_GSSIZE_FORMAT "I64d"
+#define G_GSSIZE_MODIFIER "I64"
 #define G_GSIZE_FORMAT "I64u"
+#define G_GSSIZE_FORMAT "I64d"
 
 #define G_MAXSIZE      G_MAXUINT64
 #define G_MINSSIZE     G_MININT64
@@ -93,8 +94,9 @@ typedef unsigned long long gsize;
 typedef signed int gssize;
 typedef unsigned int gsize;
 #define G_GSIZE_MODIFIER ""
-#define G_GSSIZE_FORMAT "i"
+#define G_GSSIZE_MODIFIER ""
 #define G_GSIZE_FORMAT "u"
+#define G_GSSIZE_FORMAT "i"
 
 #define G_MAXSIZE      G_MAXUINT
 #define G_MINSSIZE     G_MININT
@@ -148,9 +150,11 @@ typedef unsigned __int64 guintptr;
 
 #endif
 
+#ifndef G_DISABLE_DEPRECATED
 #define g_ATEXIT(proc) (atexit (proc))
 
 #define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END
+#endif
 
 #define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@
 #define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@