glib r7563 - in trunk: . glib glib/gnulib

[tml svn gnome org]

Author: tml
Date: Tue Sep 30 14:04:35 2008
New Revision: 7563
URL: http://svn.gnome.org/viewvc/glib?rev=7563&view=rev

Log:
2008-09-30  Tor Lillqvist  <tml novell com>

	* glib/gprintf.c
	* glib/gnulib/vasnprintf.c: Don't define _GNU_SOURCE on Windows,
	as _GNU_SOURCE has unintended side effects when compiling against
	newest mingw headers.



Modified:
   trunk/ChangeLog
   trunk/glib/gnulib/vasnprintf.c
   trunk/glib/gprintf.c

Modified: trunk/glib/gnulib/vasnprintf.c
==============================================================================
--- trunk/glib/gnulib/vasnprintf.c	(original)
+++ trunk/glib/gnulib/vasnprintf.c	Tue Sep 30 14:04:35 2008
@@ -16,12 +16,14 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.  */
 
+#ifndef _WIN32
 /* Tell glibc's <stdio.h> to provide a prototype for snprintf().
    This must come before <config.h> because <config.h> may include
    <features.h>, and once <features.h> has been included, it's too late.  */
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE    1
 #endif
+#endif
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

Modified: trunk/glib/gprintf.c
==============================================================================
--- trunk/glib/gprintf.c	(original)
+++ trunk/glib/gprintf.c	Tue Sep 30 14:04:35 2008
@@ -19,7 +19,9 @@
 
 #include "config.h"
 
+#ifndef _WIN32
 #define _GNU_SOURCE		/* For vasprintf */
+#endif
 
 #include <stdarg.h>
 #include <stdlib.h>