diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2017-06-14 11:48:27 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2017-06-14 11:48:27 +0800 |
| commit | ad49479265d061eb73682648feb550b105c3898c (patch) | |
| tree | 0998abbe795ea16af3e21103bfef4bec411b3570 | |
| parent | 951fd642dc49bbbc49f4929cfe47b643b161c992 (diff) | |
| download | glib-ad49479265d061eb73682648feb550b105c3898c.tar.gz | |
Visual Studio builds: Visual Studio 2013 and later has va_copy()
Update config.h.win32.in and glib/glibconfig.h.win32.in to indicate so.
| -rw-r--r-- | config.h.win32.in | 4 | ||||
| -rw-r--r-- | glib/glibconfig.h.win32.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config.h.win32.in b/config.h.win32.in index b1c69df20..eaf7e2818 100644 --- a/config.h.win32.in +++ b/config.h.win32.in @@ -56,9 +56,9 @@ #define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@ /* A 'va_copy' style function */ -#ifndef _MSC_VER +#if !defined (_MSC_VER) || (_MSC_VER >= 1800) #define G_VA_COPY va_copy -#else /* _MSC_VER */ +#else /* _MSC_VER && _MSC_VER < 1800 */ /* #undef G_VA_COPY */ #endif /* _MSC_VER */ diff --git a/glib/glibconfig.h.win32.in b/glib/glibconfig.h.win32.in index ab7e68d04..9a91c5e96 100644 --- a/glib/glibconfig.h.win32.in +++ b/glib/glibconfig.h.win32.in @@ -168,9 +168,9 @@ typedef unsigned __int64 guintptr; #define G_PLATFORM_WIN32 @GLIB_WIN32_STATIC_COMPILATION_DEFINE@ -#ifndef _MSC_VER +#if !defined (_MSC_VER) || (_MSC_VER >= 1800) #define G_VA_COPY va_copy -#endif /* not _MSC_VER */ +#endif /* not _MSC_VER or 2013 or later */ #ifndef _MSC_VER #define G_HAVE_ISO_VARARGS 1 |