diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 10 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | glib/gslice.c | 10 |
5 files changed, 37 insertions, 7 deletions
@@ -1,3 +1,13 @@ +Tue Feb 14 17:00:43 2006 Tim Janik <timj@imendio.com> + + * glib/gslice.c: only define _XOPEN_SOURCE to 600 to get at + posix_memalign() in case we actually are going to use it, because + we detected a compliant implementation (#328997). + + * configure.in (enable_included_printf): don't include malloc.h when + testing for posix_memalign() funcitonality, since this may break the + test on some systems (#328997). + 2006-02-14 Matthias Clasen <mclasen@redhat.com> * glib/gstrfuncs.c: Improve docs. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 715f75626..ea6b4b5f5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Tue Feb 14 17:00:43 2006 Tim Janik <timj@imendio.com> + + * glib/gslice.c: only define _XOPEN_SOURCE to 600 to get at + posix_memalign() in case we actually are going to use it, because + we detected a compliant implementation (#328997). + + * configure.in (enable_included_printf): don't include malloc.h when + testing for posix_memalign() funcitonality, since this may break the + test on some systems (#328997). + 2006-02-14 Matthias Clasen <mclasen@redhat.com> * glib/gstrfuncs.c: Improve docs. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 715f75626..ea6b4b5f5 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,13 @@ +Tue Feb 14 17:00:43 2006 Tim Janik <timj@imendio.com> + + * glib/gslice.c: only define _XOPEN_SOURCE to 600 to get at + posix_memalign() in case we actually are going to use it, because + we detected a compliant implementation (#328997). + + * configure.in (enable_included_printf): don't include malloc.h when + testing for posix_memalign() funcitonality, since this may break the + test on some systems (#328997). + 2006-02-14 Matthias Clasen <mclasen@redhat.com> * glib/gstrfuncs.c: Improve docs. diff --git a/configure.in b/configure.in index d23aa812f..480d7b15e 100644 --- a/configure.in +++ b/configure.in @@ -1028,8 +1028,8 @@ AC_CACHE_VAL(glib_cv_compliant_posix_memalign,[ if test "$ac_cv_func_posix_memalign" = "yes" ; then AC_TRY_RUN([ #define _XOPEN_SOURCE 600 - #include <stdlib.h> - #include <malloc.h> + #include <stdlib.h> /* posix_memalign() should be defined here */ + /* some systems break if #include <malloc.h> used */ static void test_memalign (size_t boundary, size_t size) { void *mem = 0; if (posix_memalign (&mem, boundary, size) != 0 || !mem) diff --git a/glib/gslice.c b/glib/gslice.c index 4d377f20e..afc6b7204 100644 --- a/glib/gslice.c +++ b/glib/gslice.c @@ -20,7 +20,11 @@ #include "config.h" -#ifdef HAVE_POSIX_MEMALIGN +#if defined HAVE_POSIX_MEMALIGN && defined POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS +# define HAVE_COMPLIANT_POSIX_MEMALIGN 1 +#endif + +#ifdef HAVE_COMPLIANT_POSIX_MEMALIGN #define _XOPEN_SOURCE 600 /* posix_memalign() */ #endif #include <stdlib.h> /* posix_memalign() */ @@ -38,10 +42,6 @@ #include <process.h> #endif -#if defined HAVE_POSIX_MEMALIGN && defined POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS -# define HAVE_COMPLIANT_POSIX_MEMALIGN 1 -#endif - /* the GSlice allocator is split up into 4 layers, roughly modelled after the slab * allocator and magazine extensions as outlined in: |