diff options
| author | bjasspa <bjasspa@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-07-01 13:15:10 +0000 |
|---|---|---|
| committer | bjasspa <bjasspa@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-07-01 13:15:10 +0000 |
| commit | 1c3cc1917229aa506ee11176ae8bbddfd87c1c27 (patch) | |
| tree | 4098a54a1df63c073b68de9c9f6159d264bba353 /navit | |
| parent | f34c8dbf949c56a9b2fb70bf2a3d28e71f62867f (diff) | |
| download | navit-1c3cc1917229aa506ee11176ae8bbddfd87c1c27.tar.gz | |
Changed the name of struct member 'free' to wfree to allow debug malloc libraries to redefine 'free' to a macro
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5170 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit')
| -rw-r--r-- | navit/gui/internal/gui_internal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/navit/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c index 502a3ec3c..ecf4fd0f1 100644 --- a/navit/gui/internal/gui_internal.c +++ b/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; |