mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
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
This commit is contained in:
parent
8eba0aa91b
commit
e9149d926a
@ -1,3 +1,10 @@
|
|||||||
|
2005-12-27 Derek Atkins <derek@ihtfp.com>
|
||||||
|
|
||||||
|
* 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 <hampton@employees.org>
|
2005-12-26 David Hampton <hampton@employees.org>
|
||||||
|
|
||||||
* src/import-export/hbci/glade/hbciprefs.glade: Remember value of
|
* src/import-export/hbci/glade/hbciprefs.glade: Remember value of
|
||||||
|
@ -387,8 +387,7 @@ typedef GogPlotView GogRTView;
|
|||||||
typedef GogPlotViewClass GogRTViewClass;
|
typedef GogPlotViewClass GogRTViewClass;
|
||||||
|
|
||||||
static double
|
static double
|
||||||
//double
|
gogi_fmin (double a, double b)
|
||||||
fmin (double a, double b)
|
|
||||||
{
|
{
|
||||||
return (a < b) ? a : 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 const *cur_selection,
|
||||||
GogObject **obj, char **name)
|
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.;
|
x -= view->allocation.x + view->allocation.w/2.;
|
||||||
y -= view->allocation.y + view->allocation.h/2.;
|
y -= view->allocation.y + view->allocation.h/2.;
|
||||||
|
Loading…
Reference in New Issue
Block a user