Fix a build problem on OS X.

diff --git a/ChangeLog b/ChangeLog
index 4a6594e6aa0c3b8e107a483229835030b50cf9df..1e9a3428c5519f91292a9d4ffeb088a3695d1ebf 100644 (file)
--- 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 4a6594e6aa0c3b8e107a483229835030b50cf9df..1e9a3428c5519f91292a9d4ffeb088a3695d1ebf 100644 (file)
--- 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 4a6594e6aa0c3b8e107a483229835030b50cf9df..1e9a3428c5519f91292a9d4ffeb088a3695d1ebf 100644 (file)
--- 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 74784d39cd2a538659a3cb39c0fb2eae712ea5db..56ae5246077861f0f50f7df9b0d2ba278451e2ed 100644 (file)
--- 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>