From 0e4aa421eb5f5327dbd8d23ace8fefac6d4f0855 Mon Sep 17 00:00:00 2001 From: bjasspa Date: Sun, 1 Jul 2012 13:15:10 +0000 Subject: [PATCH] Changed the name of struct member 'free' to wfree to allow debug malloc libraries to redefine 'free' to a macro git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@5170 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/gui/internal/gui_internal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/navit/navit/gui/internal/gui_internal.c b/navit/navit/gui/internal/gui_internal.c index 502a3ec..ecf4fd0 100644 --- a/navit/navit/gui/internal/gui_internal.c +++ b/navit/navit/gui/internal/gui_internal.c @@ -131,7 +131,7 @@ struct widget { * on deallocation actions to be specified on a per widget basis. * This function will call g_free on the widget (if required). */ - void (*free) (struct gui_priv *this_, struct widget * w); + void (*wfree) (struct gui_priv *this_, struct widget * w); char *prefix; char *name; char *speech; @@ -1592,8 +1592,8 @@ static void gui_internal_widget_destroy(struct gui_priv *this, struct widget *w) w->remove_cb(w->instance, w->cb); if (w==this->highlighted) this->highlighted=NULL; - if(w->free) - w->free(this,w); + if(w->wfree) + w->wfree(this,w); else g_free(w); } @@ -7491,7 +7491,7 @@ gui_internal_cmd2_route_description(struct gui_priv *this, char *function, struc menu=gui_internal_menu(this,_("Route Description")); - menu->free=gui_internal_route_screen_free; + menu->wfree=gui_internal_route_screen_free; this->route_data.route_showing=1; this->route_data.route_table->spx = this->spacing; -- 2.7.4