[Gnucash-changes] Frederic Leroy's update to Dan Widyono's patch to
compile cleanly on 64
David Hampton
hampton at cvs.gnucash.org
Mon Aug 15 20:13:50 EDT 2005
Log Message:
-----------
Frederic Leroy's update to Dan Widyono's patch to compile cleanly on 64
bit systems.
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash:
ChangeLog
gnucash/src/backend/file/test:
test-xml-transaction.c
gnucash/src/business/business-core/file:
gnc-bill-term-xml-v2.c
gnc-tax-table-xml-v2.c
gnucash/src/engine:
Account.c
Transaction.c
cap-gains.c
qof_book_merge.c
qofquery.c
qofsession.c
gnucash/src/gnome:
dialog-budget-workbench.c
gnucash/src/gnome-utils:
gnc-html.c
gnc-plugin-menu-additions.c
Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.263
retrieving revision 1.1487.2.264
diff -LChangeLog -LChangeLog -u -r1.1487.2.263 -r1.1487.2.264
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,19 @@
2005-08-15 David Hampton <hampton at employees.org>
+ * src/backend/file/test/test-xml-transaction.c:
+ * src/business/business-core/file/gnc-bill-term-xml-v2.c:
+ * src/business/business-core/file/gnc-tax-table-xml-v2.c:
+ * src/engine/Account.c:
+ * src/engine/Transaction.c:
+ * src/engine/cap-gains.c:
+ * src/engine/qof_book_merge.c:
+ * src/engine/qofquery.c:
+ * src/engine/qofsession.c:
+ * src/gnome/dialog-budget-workbench.c:
+ * src/gnome-utils/gnc-html.c:
+ * src/gnome-utils/gnc-plugin-menu-additions.c: Frederic Leroy's
+ update to Dan Widyono's patch to compile cleanly on 64 bit systems.
+
* src/register/register-gnome/gnucash-item-edit.c: Scott Oonk's fix
to make the cursor visible in the register.
Index: gnc-bill-term-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-bill-term-xml-v2.c,v
retrieving revision 1.3.4.4
retrieving revision 1.3.4.5
diff -Lsrc/business/business-core/file/gnc-bill-term-xml-v2.c -Lsrc/business/business-core/file/gnc-bill-term-xml-v2.c -u -r1.3.4.4 -r1.3.4.5
--- src/business/business-core/file/gnc-bill-term-xml-v2.c
+++ src/business/business-core/file/gnc-bill-term-xml-v2.c
@@ -658,7 +658,7 @@
gint32 count = GPOINTER_TO_INT(value);
if (count != gncBillTermGetRefcount(term) && !gncBillTermGetInvisible(term)) {
- PWARN("Fixing refcount on billterm %s (%lld -> %d)\n",
+ PWARN("Fixing refcount on billterm %s (%" G_GINT64_FORMAT " -> %d)\n",
guid_to_string(qof_instance_get_guid(QOF_INSTANCE(term))),
gncBillTermGetRefcount(term), count)
gncBillTermSetRefcount(term, count);
Index: gnc-tax-table-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-tax-table-xml-v2.c,v
retrieving revision 1.3.4.4
retrieving revision 1.3.4.5
diff -Lsrc/business/business-core/file/gnc-tax-table-xml-v2.c -Lsrc/business/business-core/file/gnc-tax-table-xml-v2.c -u -r1.3.4.4 -r1.3.4.5
--- src/business/business-core/file/gnc-tax-table-xml-v2.c
+++ src/business/business-core/file/gnc-tax-table-xml-v2.c
@@ -620,7 +620,7 @@
gint32 count = GPOINTER_TO_INT(value);
if (count != gncTaxTableGetRefcount(table) && !gncTaxTableGetInvisible(table)) {
- PWARN("Fixing refcount on taxtable %s (%lld -> %d)\n",
+ PWARN("Fixing refcount on taxtable %s (%" G_GINT64_FORMAT " -> %d)\n",
guid_to_string(qof_instance_get_guid(QOF_INSTANCE(table))),
gncTaxTableGetRefcount(table), count)
gncTaxTableSetRefcount(table, count);
Index: qof_book_merge.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/qof_book_merge.c,v
retrieving revision 1.2.2.9
retrieving revision 1.2.2.10
diff -Lsrc/engine/qof_book_merge.c -Lsrc/engine/qof_book_merge.c -u -r1.2.2.9 -r1.2.2.10
--- src/engine/qof_book_merge.c
+++ src/engine/qof_book_merge.c
@@ -919,7 +919,7 @@
if(safe_strcmp(paramType, QOF_TYPE_INT64) == 0) {
int64_getter = (gint64 (*)(QofEntity*, QofParam*)) qtparam->param_getfcn;
param_i64 = int64_getter(qtEnt, qtparam);
- param_string = g_strdup_printf("%lld", param_i64);
+ param_string = g_strdup_printf("%" G_GINT64_FORMAT, param_i64);
return param_string;
}
if(safe_strcmp(paramType, QOF_TYPE_DOUBLE) == 0) {
Index: qofquery.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/qofquery.c,v
retrieving revision 1.10.2.7
retrieving revision 1.10.2.8
diff -Lsrc/engine/qofquery.c -Lsrc/engine/qofquery.c -u -r1.10.2.7 -r1.10.2.8
--- src/engine/qofquery.c
+++ src/engine/qofquery.c
@@ -1740,7 +1740,7 @@
if (!safe_strcmp (pd->type_name, QOF_TYPE_INT64))
{
query_int64_t pdata = (query_int64_t) pd;
- g_string_sprintfa (gs, " int64: %lld", pdata->val);
+ g_string_sprintfa (gs, " int64: %" G_GINT64_FORMAT, pdata->val);
return;
}
if (!safe_strcmp (pd->type_name, QOF_TYPE_INT32))
Index: Transaction.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/Transaction.c,v
retrieving revision 1.261.4.11
retrieving revision 1.261.4.12
diff -Lsrc/engine/Transaction.c -Lsrc/engine/Transaction.c -u -r1.261.4.11 -r1.261.4.12
--- src/engine/Transaction.c
+++ src/engine/Transaction.c
@@ -749,8 +749,9 @@
xaccSplitSetAmount (Split *s, gnc_numeric amt)
{
if(!s) return;
- ENTER ("(split=%p) old amt=%lld/%lld new amt=%lld/%lld", s,
- s->amount.num, s->amount.denom, amt.num, amt.denom);
+ ENTER ("(split=%p) old amt=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT
+ " new amt=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT, s,
+ s->amount.num, s->amount.denom, amt.num, amt.denom);
check_open (s->parent);
s->amount = gnc_numeric_convert(amt, get_commodity_denom(s), GNC_HOW_RND_ROUND);
@@ -764,8 +765,9 @@
xaccSplitSetValue (Split *s, gnc_numeric amt)
{
if(!s) return;
- ENTER ("(split=%p) old val=%lld/%lld new val=%lld/%lld", s,
- s->value.num, s->value.denom, amt.num, amt.denom);
+ ENTER ("(split=%p) old val=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT
+ " new val=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT, s,
+ s->value.num, s->value.denom, amt.num, amt.denom);
check_open (s->parent);
s->value = gnc_numeric_convert(amt, get_currency_denom(s), GNC_HOW_RND_ROUND);
@@ -1372,7 +1374,8 @@
gnc_commodity_get_fraction (base_currency),
GNC_HOW_RND_ROUND);
- LEAVE (" total=%lld/%lld", value.num, value.denom);
+ LEAVE (" total=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT,
+ value.num, value.denom);
return value;
}
@@ -2866,7 +2869,8 @@
*/
if (gnc_numeric_check(price))
{
- PERR("Computing share price failed (%d): [ %lld / %lld ] / [ %lld / %lld ]",
+ PERR("Computing share price failed (%d): [ %" G_GINT64_FORMAT " / %"
+ G_GINT64_FORMAT " ] / [ %" G_GINT64_FORMAT " / %" G_GINT64_FORMAT " ]",
gnc_numeric_check(price), val.num, val.denom, amt.num, amt.denom);
return gnc_numeric_create(0,1);
}
Index: Account.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/Account.c,v
retrieving revision 1.222.4.14
retrieving revision 1.222.4.15
diff -Lsrc/engine/Account.c -Lsrc/engine/Account.c -u -r1.222.4.14 -r1.222.4.15
--- src/engine/Account.c
+++ src/engine/Account.c
@@ -998,8 +998,8 @@
cleared_balance = acc->starting_cleared_balance;
reconciled_balance = acc->starting_reconciled_balance;
- PINFO ("acct=%s starting baln=%lld/%lld", acc->accountName,
- balance.num, balance.denom);
+ PINFO ("acct=%s starting baln=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT,
+ acc->accountName, balance.num, balance.denom);
for(lp = acc->splits; lp; lp = lp->next)
{
Split *split = (Split *) lp->data;
@@ -1902,7 +1902,7 @@
rc = xaccAccountGetXxxBalanceInCurrencyRecursive (account,
xaccAccountGetBalance,
report_commodity, include_children);
- PINFO (" baln=%lld/%lld", rc.num, rc.denom);
+ PINFO (" baln=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT, rc.num, rc.denom);
return rc;
}
Index: qofsession.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/qofsession.c,v
retrieving revision 1.2.4.19
retrieving revision 1.2.4.20
diff -Lsrc/engine/qofsession.c -Lsrc/engine/qofsession.c -u -r1.2.4.19 -r1.2.4.20
--- src/engine/qofsession.c
+++ src/engine/qofsession.c
@@ -341,7 +341,8 @@
{
gboolean partial;
- partial = (gboolean)qof_book_get_data(book, PARTIAL_QOFBOOK);
+ partial =
+ (gboolean)GPOINTER_TO_INT(qof_book_get_data(book, PARTIAL_QOFBOOK));
if(!partial) {
qof_book_set_data(book, PARTIAL_QOFBOOK, (gboolean*)TRUE);
}
@@ -1240,7 +1241,7 @@
session, session->book_id ? session->book_id : "(null)");
/* Partial book handling. */
book = qof_session_get_book(session);
- partial = (gboolean)qof_book_get_data(book, PARTIAL_QOFBOOK);
+ partial = (gboolean)GPOINTER_TO_INT(qof_book_get_data(book, PARTIAL_QOFBOOK));
change_backend = FALSE;
msg = g_strdup_printf(" ");
book_id = g_strdup(session->book_id);
Index: cap-gains.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/cap-gains.c,v
retrieving revision 1.13.4.5
retrieving revision 1.13.4.6
diff -Lsrc/engine/cap-gains.c -Lsrc/engine/cap-gains.c -u -r1.13.4.5 -r1.13.4.6
--- src/engine/cap-gains.c
+++ src/engine/cap-gains.c
@@ -162,7 +162,7 @@
static inline GNCLot *
xaccAccountFindOpenLot (Account *acc, gnc_numeric sign,
gnc_commodity *currency,
- long long guess,
+ gint64 guess,
gboolean (*date_pred)(Timespec, Timespec))
{
struct find_lot_s es;
@@ -185,10 +185,10 @@
gnc_commodity *currency)
{
GNCLot *lot;
- ENTER (" sign=%lld/%lld", sign.num, sign.denom);
+ ENTER (" sign=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT, sign.num, sign.denom);
lot = xaccAccountFindOpenLot (acc, sign, currency,
- 10000000LL * ((long long) LONG_MAX), earliest_pred);
+ G_GINT64_CONSTANT(2^31) * G_GINT64_CONSTANT(2^31), earliest_pred);
LEAVE ("found lot=%p %s baln=%s", lot, gnc_lot_get_title (lot),
gnc_num_dbg_to_string(gnc_lot_get_balance(lot)));
return lot;
@@ -199,10 +199,12 @@
gnc_commodity *currency)
{
GNCLot *lot;
- ENTER (" sign=%lld/%lld", sign.num, sign.denom);
+ ENTER (" sign=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT,
+ sign.num, sign.denom);
lot = xaccAccountFindOpenLot (acc, sign, currency,
- -10000000LL * ((long long) LONG_MAX), latest_pred);
+ G_GINT64_CONSTANT(-2^31) * G_GINT64_CONSTANT(2^31),
+ latest_pred);
LEAVE ("found lot=%p %s", lot, gnc_lot_get_title (lot));
return lot;
}
@@ -569,7 +571,7 @@
/* Provide a reasonable title for the new lot */
id = kvp_frame_get_gint64 (xaccAccountGetSlots (acc), "/lot-mgmt/next-id");
- snprintf (buff, 200, _("Lot %lld"), id);
+ snprintf (buff, 200, _("Lot %" G_GINT64_FORMAT), id);
kvp_frame_set_str (gnc_lot_get_slots (lot), "/title", buff);
id ++;
kvp_frame_set_gint64 (xaccAccountGetSlots (acc), "/lot-mgmt/next-id", id);
Index: test-xml-transaction.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-xml-transaction.c,v
retrieving revision 1.17.4.4
retrieving revision 1.17.4.5
diff -Lsrc/backend/file/test/test-xml-transaction.c -Lsrc/backend/file/test/test-xml-transaction.c -u -r1.17.4.4 -r1.17.4.5
--- src/backend/file/test/test-xml-transaction.c
+++ src/backend/file/test/test-xml-transaction.c
@@ -128,7 +128,9 @@
if(!gnc_numeric_equal(*num, val))
{
g_free(num);
- return g_strdup_printf ("values differ: %lld/%lld v %lld/%lld",
+ return g_strdup_printf ("values differ: %" G_GINT64_FORMAT "/%"
+ G_GINT64_FORMAT " v %" G_GINT64_FORMAT
+ "/%" G_GINT64_FORMAT,
(*num).num, (*num).denom,
val.num, val.denom);
}
@@ -140,14 +142,19 @@
gnc_numeric val = xaccSplitGetAmount(spl);
if (!gnc_numeric_equal(*num, val)) {
- return g_strdup_printf( "quantities differ under _equal: %lld/%lld v %lld/%lld",
+ return g_strdup_printf( "quantities differ under _equal: %"
+ G_GINT64_FORMAT "/%" G_GINT64_FORMAT
+ " v %" G_GINT64_FORMAT "/%"
+ G_GINT64_FORMAT,
(*num).num, (*num).denom,
val.num, val.denom );
}
if(!gnc_numeric_equal(*num, val))
{
g_free(num);
- return g_strdup_printf ("quantities differ: %lld/%lld v %lld/%lld",
+ return g_strdup_printf ("quantities differ: %" G_GINT64_FORMAT
+ "/%" G_GINT64_FORMAT " v %"
+ G_GINT64_FORMAT "/%" G_GINT64_FORMAT,
(*num).num, (*num).denom,
val.num, val.denom);
}
Index: dialog-budget-workbench.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/dialog-budget-workbench.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lsrc/gnome/dialog-budget-workbench.c -Lsrc/gnome/dialog-budget-workbench.c -u -r1.1.2.3 -r1.1.2.4
--- src/gnome/dialog-budget-workbench.c
+++ src/gnome/dialog-budget-workbench.c
@@ -135,7 +135,8 @@
renderer = gtk_cell_renderer_text_new ();
g_signal_connect (renderer, "edited",
G_CALLBACK (cell_edited), bench);
- g_object_set_data (G_OBJECT (renderer), "column", (gint *)colnum);
+ g_object_set_data (G_OBJECT (renderer), "column",
+ (gint *)GINT_TO_POINTER(colnum));
column = gtk_tree_view_column_new_with_attributes (buffer,
renderer,
"text", colnum,
Index: gnc-html.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-html.c,v
retrieving revision 1.23.4.11
retrieving revision 1.23.4.12
diff -Lsrc/gnome-utils/gnc-html.c -Lsrc/gnome-utils/gnc-html.c -u -r1.23.4.11 -r1.23.4.12
--- src/gnome-utils/gnc-html.c
+++ src/gnome-utils/gnc-html.c
@@ -1351,7 +1351,7 @@
if (!fh)
return FALSE;
- gtk_html_save (GTK_HTML(html->html), raw_html_receiver, fh);
+ gtk_html_save (GTK_HTML(html->html), GINT_TO_POINTER(raw_html_receiver), fh);
fclose (fh);
Index: gnc-plugin-menu-additions.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-plugin-menu-additions.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lsrc/gnome-utils/gnc-plugin-menu-additions.c -Lsrc/gnome-utils/gnc-plugin-menu-additions.c -u -r1.1.2.3 -r1.1.2.4
--- src/gnome-utils/gnc-plugin-menu-additions.c
+++ src/gnome-utils/gnc-plugin-menu-additions.c
@@ -364,7 +364,8 @@
action_list = gtk_action_group_list_actions(action_group);
// Use the following line for gtk2.6
// g_list_foreach(action_list, (GFunc)gtk_action_set_visible, (gpointer)visible);
- g_list_foreach(action_list, (GFunc)our_gtk_action_set_visible, (gpointer)visible);
+ g_list_foreach(action_list, (GFunc)our_gtk_action_set_visible,
+ GINT_TO_POINTER(visible));
g_list_free(action_list);
LEAVE(" ");
More information about the gnucash-changes
mailing list