From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Fri, 6 Jan 2006 05:50:40 +0000 (+0000)
Subject: Fix a build problem on OS X.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=4a71102e70a767fcf817ba24f91c245c97727472;p=dana%2Fcg-glib.git

Fix a build problem on OS X.
---

diff --git a/ChangeLog b/ChangeLog
index 4a6594e6..1e9a3428 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gslice.c: Only define _XOPEN_SOURCE if we know
+	that we have posix_memalign().  (#323937, Bogdan Nicula)
+
 2006-01-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4a6594e6..1e9a3428 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-01-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gslice.c: Only define _XOPEN_SOURCE if we know
+	that we have posix_memalign().  (#323937, Bogdan Nicula)
+
 2006-01-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 4a6594e6..1e9a3428 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2006-01-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gslice.c: Only define _XOPEN_SOURCE if we know
+	that we have posix_memalign().  (#323937, Bogdan Nicula)
+
 2006-01-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/glib/gslice.c b/glib/gslice.c
index 74784d39..56ae5246 100644
--- a/glib/gslice.c
+++ b/glib/gslice.c
@@ -17,7 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 /* MT safe */
+#ifdef HAVE_POSIX_MEMALIGN
 #define _XOPEN_SOURCE 600       /* posix_memalign() */
+#endif
 #include <stdlib.h>             /* posix_memalign() */
 #include <string.h>
 #include <errno.h>