diff --git a/ChangeLog b/ChangeLog index ce8a5542f..f74d8c2ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-10-23 Matthias Clasen + + * glib/gnulib/g-gnulib.h: Undef libc functions before defining + them, since they may also be macros. (#155177, Andrea Campi) + 2004-10-08 Matthias Clasen * configure.in: Bump version. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ce8a5542f..f74d8c2ad 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-10-23 Matthias Clasen + + * glib/gnulib/g-gnulib.h: Undef libc functions before defining + them, since they may also be macros. (#155177, Andrea Campi) + 2004-10-08 Matthias Clasen * configure.in: Bump version. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index ce8a5542f..f74d8c2ad 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2004-10-23 Matthias Clasen + + * glib/gnulib/g-gnulib.h: Undef libc functions before defining + them, since they may also be macros. (#155177, Andrea Campi) + 2004-10-08 Matthias Clasen * configure.in: Bump version. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ce8a5542f..f74d8c2ad 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-10-23 Matthias Clasen + + * glib/gnulib/g-gnulib.h: Undef libc functions before defining + them, since they may also be macros. (#155177, Andrea Campi) + 2004-10-08 Matthias Clasen * configure.in: Bump version. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ce8a5542f..f74d8c2ad 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-10-23 Matthias Clasen + + * glib/gnulib/g-gnulib.h: Undef libc functions before defining + them, since they may also be macros. (#155177, Andrea Campi) + 2004-10-08 Matthias Clasen * configure.in: Bump version. diff --git a/glib/gnulib/g-gnulib.h b/glib/gnulib/g-gnulib.h index c0d904f35..ce5dab7c5 100644 --- a/glib/gnulib/g-gnulib.h +++ b/glib/gnulib/g-gnulib.h @@ -29,6 +29,9 @@ #define printf_fetchargs _g_gnulib_printf_fetchargs /* Use GLib memory allocation */ +#undef malloc +#undef realloc +#undef free #define malloc g_malloc #define realloc g_realloc #define free g_free