From 1632d5716e5df22ff4eaf5698245cee2dd70f82c Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 7 Jan 2015 09:59:47 +0800 Subject: [PATCH] Win32: Update Pre-configured Config Headers Update config.h.win32.in and glibconfig.h.win32.in so that they 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 to update glibconfig.h.win32.in in bug 727829. --- config.h.win32.in | 3 +++ glib/glibconfig.h.win32.in | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/config.h.win32.in b/config.h.win32.in index aa700e35b..434901032 100644 --- a/config.h.win32.in +++ b/config.h.win32.in @@ -399,6 +399,9 @@ /* Define to 1 if libselinux is available */ /* #undef HAVE_SELINUX */ +/* Define to 1 if you have the `sendmmsg` function */ +/* #undef HAVE_SENDMMSG */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_SELINUX_SELINUX_H */ diff --git a/glib/glibconfig.h.win32.in b/glib/glibconfig.h.win32.in index fc638879a..418cbe06a 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@ -- 2.34.1