From e9149d926a0d2c782ff919e13df6412e41c82ce4 Mon Sep 17 00:00:00 2001 From: Derek Atkins Date: Tue, 27 Dec 2005 15:41:07 +0000 Subject: [PATCH] raname internal fmin() to gogi_fmin(). * lib/goffice-0.0.4/plugins/plot_radar/gog-radar.c: rename 'fmin()' to 'gogi_fmin()' to prevent double declaration on MacOS. It's an internal (static) function so we can safely rename the function. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12184 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 7 +++++++ lib/goffice-0.0.4/plugins/plot_radar/gog-radar.c | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 658a06330e..04a1db7464 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-12-27 Derek Atkins + + * lib/goffice-0.0.4/plugins/plot_radar/gog-radar.c: + rename 'fmin()' to 'gogi_fmin()' to prevent double + declaration on MacOS. It's an internal (static) function + so we can safely rename the function. + 2005-12-26 David Hampton * src/import-export/hbci/glade/hbciprefs.glade: Remember value of diff --git a/lib/goffice-0.0.4/plugins/plot_radar/gog-radar.c b/lib/goffice-0.0.4/plugins/plot_radar/gog-radar.c index 308cfd9dc8..789f56de8c 100644 --- a/lib/goffice-0.0.4/plugins/plot_radar/gog-radar.c +++ b/lib/goffice-0.0.4/plugins/plot_radar/gog-radar.c @@ -387,8 +387,7 @@ typedef GogPlotView GogRTView; typedef GogPlotViewClass GogRTViewClass; static double -//double -fmin (double a, double b) +gogi_fmin (double a, double b) { return (a < b) ? a : b; } @@ -519,7 +518,7 @@ gog_rt_view_info_at_point (GogView *view, double x, double y, GogObject const *cur_selection, GogObject **obj, char **name) { - double radius = fmin (view->allocation.h, view->allocation.w)/2.0; + double radius = gogi_fmin (view->allocation.h, view->allocation.w)/2.0; x -= view->allocation.x + view->allocation.w/2.; y -= view->allocation.y + view->allocation.h/2.;