IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-11-25 10:20:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename private min/max functions to avoid name collisions with existing functions of macros, as suggested by Jon Arney

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15207 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2006-12-12 11:28:08 +00:00
parent 4d598abed4
commit 29bf7e2dd1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gnome-utils/gnc-frequency.c
View File

@ -26,6 +26,7 @@
#include "config.h"
#include <gtk/gtk.h>
#include <glib/gtypes.h>
#include "glib-compat.h"
#include <math.h>
#include <time.h>
@ -977,7 +978,7 @@ yearly_sel_changed( GtkButton *b, gpointer d )
tmptm->tm_mday = gtk_combo_box_get_active( GTK_COMBO_BOX(o) )+1;
/* FIXME: correct for
option_menu_selected_day > min(31,correct_days_in_month)
option_menu_selected_day > minn(31,correct_days_in_month)
problem */
while ( ! g_date_valid_dmy( tmptm->tm_mday,
tmptm->tm_mon+1,
@ -991,12 +992,12 @@ yearly_sel_changed( GtkButton *b, gpointer d )
g_signal_emit_by_name( gf, "changed" );
}
static inline guint32 min( guint32 a, guint32 b )
static inline guint32 minn( guint32 a, guint32 b )
{
return a > b ? b : a;
}
static inline guint32 max( guint32 a, guint32 b )
static inline guint32 maxn( guint32 a, guint32 b )
{
return a > b ? a : b;
}
@ -1031,10 +1032,10 @@ freq_combo_changed( GtkComboBox *b, gpointer d )
tmpDate = mktime( tmpTm );
tmpTm = localtime( &tmpDate );
gtk_combo_box_set_active( GTK_COMBO_BOX(o),
min( tmpTm->tm_mday, tmpDayOfMonth ) - 1 );
minn( tmpTm->tm_mday, tmpDayOfMonth ) - 1 );
o = glade_xml_get_widget( gf->gxml, "semimonthly_second" );
gtk_combo_box_set_active( GTK_COMBO_BOX(o),
max( tmpTm->tm_mday, tmpDayOfMonth ) - 1 );
maxn( tmpTm->tm_mday, tmpDayOfMonth ) - 1 );
}
break;
case UIFREQ_MONTHLY: