From 0f458f1e35904fb6aafdafdd05254153ec827c2b Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri, 19 Aug 2011 14:33:20 +0800
Subject: [PATCH] Update config.h.win32.in

-Only define HAVE_STRINGS_H when MSVC is not used
-Define HVE_STDINT_H for Visual C++ 2010 and later, as Visual C++ 2010
 does ship with a "proper" stdint.h by default
-Add check macros HAVE_RINT and HAVE_ROUND--they are only defined when
 MSVC is not used
-Remove obsolete check macros
---
 config.h.win32.in | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/config.h.win32.in b/config.h.win32.in
index 23f0156685..819b09e472 100644
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -112,11 +112,15 @@
 /* Have the Xrandr extension library */
 /* #undef HAVE_RANDR */
 
-/* Define to 1 if shm.h is available */
-/* #undef HAVE_SHM_H */
+/* Define to 1 if rint() is available */
+#ifndef _MSC_VER
+#define HAVE_RINT 1
+#endif
 
-/* Define to 1 if sigsetjmp is available */
-/* #undef HAVE_SIGSETJMP */
+/* Define to 1 if round() is available */
+#ifndef _MSC_VER
+#define HAVE_ROUND 1
+#endif
 
 /* Have the sockaddr_un.sun_len member */
 /* #undef HAVE_SOCKADDR_UN_SUN_LEN */
@@ -128,6 +132,9 @@
 #ifndef _MSC_VER
 #define HAVE_STDINT_H 1
 #else
+#if (_MSC_VER >= 1600) /* VS 2010+ ships with stdint.h */
+#define HAVE_STDINT_H 1
+#endif
 /* #undef HAVE_STDINT_H */
 #endif
 
@@ -135,7 +142,9 @@
 #define HAVE_STDLIB_H 1
 
 /* Define to 1 if you have the <strings.h> header file. */
+#ifndef _MSC_VER
 #define HAVE_STRINGS_H 1
+#endif
 
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1