From e3d190c92f16c3b6cd3bf3791959c247b7aaa7ac Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 2 Sep 2008 21:35:18 -0400
Subject: [PATCH] [boilerplate] Cleanup

---
 boilerplate/Makefile.am | 5 -----
 boilerplate/xmalloc.c   | 2 ++
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am
index 79cb44485..7efb56f29 100644
--- a/boilerplate/Makefile.am
+++ b/boilerplate/Makefile.am
@@ -87,12 +87,7 @@ libcairoboilerplate_la_SOURCES += cairo-boilerplate-xlib.h
 libcairoboilerplate_la_SOURCES += cairo-boilerplate-xlib-private.h
 endif
 
-# We're using _GNU_SOURCE to get the prototype for asprintf. This may
-# not be the most portable approach, but it is pragmatic and I'm
-# willing to do something cleaner as soon as it causes someone a
-# problem.
 INCLUDES =					\
-	-D_GNU_SOURCE				\
 	-I$(srcdir)				\
 	-I$(top_srcdir)/pixman/src		\
 	-I$(top_builddir)/src			\
diff --git a/boilerplate/xmalloc.c b/boilerplate/xmalloc.c
index 5b9110820..12f12e9eb 100644
--- a/boilerplate/xmalloc.c
+++ b/boilerplate/xmalloc.c
@@ -23,6 +23,8 @@
  * Author: Carl D. Worth <cworth@cworth.org>
  */
 
+#define _GNU_SOURCE 1 /* for vasprintf */
+
 #include "cairo-boilerplate.h"
 #include "xmalloc.h"