From fb8e4a91e3d870716d5eaaffc9b733978023b89a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 24 Oct 2004 01:15:08 +0000 Subject: [PATCH] Undef libc functions before defining them, since they may also be macros. 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) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-12 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ glib/gnulib/g-gnulib.h | 3 +++ 6 files changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index 03a04cf..98dab90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +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) + * glib/gkeyfile.h: * glib/gkeyfile.c: Add a parser for desktop entries and similar files with a .ini-like syntax. (#139974, Ray Strode) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 03a04cf..98dab90 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +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) + * glib/gkeyfile.h: * glib/gkeyfile.c: Add a parser for desktop entries and similar files with a .ini-like syntax. (#139974, Ray Strode) diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 03a04cf..98dab90 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +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) + * glib/gkeyfile.h: * glib/gkeyfile.c: Add a parser for desktop entries and similar files with a .ini-like syntax. (#139974, Ray Strode) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 03a04cf..98dab90 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +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) + * glib/gkeyfile.h: * glib/gkeyfile.c: Add a parser for desktop entries and similar files with a .ini-like syntax. (#139974, Ray Strode) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 03a04cf..98dab90 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +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) + * glib/gkeyfile.h: * glib/gkeyfile.c: Add a parser for desktop entries and similar files with a .ini-like syntax. (#139974, Ray Strode) diff --git a/glib/gnulib/g-gnulib.h b/glib/gnulib/g-gnulib.h index c0d904f..ce5dab7 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 -- 2.7.4