gnucash maint: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sun Dec 14 19:39:45 EST 2014
Updated via https://github.com/Gnucash/gnucash/commit/c85c4529 (commit)
via https://github.com/Gnucash/gnucash/commit/dd544de7 (commit)
via https://github.com/Gnucash/gnucash/commit/08a43949 (commit)
from https://github.com/Gnucash/gnucash/commit/620832f4 (commit)
commit c85c4529fd5b132b3f0dc554c58646b8636799c4
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 14 16:38:48 2014 -0800
Still more Guile library path additions, this time in tests.
diff --git a/src/gnome-utils/test/Makefile.am b/src/gnome-utils/test/Makefile.am
index f80c4f0..d3383c7 100644
--- a/src/gnome-utils/test/Makefile.am
+++ b/src/gnome-utils/test/Makefile.am
@@ -17,6 +17,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_builddir}/src/core-utils \
--guile-load-dir ${top_builddir}/src/app-utils \
--guile-load-dir ${top_builddir}/src/gnome-utils \
+ --library-dir ${top_builddir}/src/gnome-utils \
--library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
diff --git a/src/report/report-gnome/test/Makefile.am b/src/report/report-gnome/test/Makefile.am
index 98b12fc..d713f76 100644
--- a/src/report/report-gnome/test/Makefile.am
+++ b/src/report/report-gnome/test/Makefile.am
@@ -38,6 +38,8 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_builddir}/src/report/utility-reports \
--guile-load-dir ${top_builddir}/src/report/report-gnome \
\
+ --library-dir ${top_builddir}/src/report/report-gnome \
+ --library-dir ${top_builddir}/src/report/report-system \
--library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/app-utils \
diff --git a/src/report/report-system/test/Makefile.am b/src/report/report-system/test/Makefile.am
index 3e5dd8c..1df692f 100644
--- a/src/report/report-system/test/Makefile.am
+++ b/src/report/report-system/test/Makefile.am
@@ -41,6 +41,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_builddir}/src/report/report-system \
--guile-load-dir ${top_builddir}/src/report/report-system/test \
\
+ --library-dir ${top_builddir}/src/report/report-system \
--library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/app-utils \
diff --git a/src/report/standard-reports/test/Makefile.am b/src/report/standard-reports/test/Makefile.am
index 61c48af..c0bbe49 100644
--- a/src/report/standard-reports/test/Makefile.am
+++ b/src/report/standard-reports/test/Makefile.am
@@ -31,6 +31,8 @@ GNC_TEST_DEPS = \
--guile-load-dir ${top_builddir}/src/report/standard-reports \
--guile-load-dir ${top_builddir}/src/report/standard-reports/test \
\
+ --library-dir ${top_builddir}/src/report/report-system \
+ --library-dir ${top_builddir}/src/report/standard-reports \
--library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/app-utils \
diff --git a/src/report/utility-reports/test/Makefile.am b/src/report/utility-reports/test/Makefile.am
index 939305c..e4bfad4 100644
--- a/src/report/utility-reports/test/Makefile.am
+++ b/src/report/utility-reports/test/Makefile.am
@@ -16,6 +16,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_builddir}/src/report/report-system \
--guile-load-dir ${top_builddir}/src/report/utility-reports \
\
+ --library-dir ${top_builddir}/src/report/report-system \
--library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/app-utils \
commit dd544de7ed576fb7120f857a1c4aa78d2a49b85b
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 14 16:37:47 2014 -0800
Use standard macro INT64_C() to silence gcc-4.2 complaint
About constants being too large for an int.
diff --git a/src/libqof/qof/gnc-numeric.c b/src/libqof/qof/gnc-numeric.c
index 5207ce2..693fdf9 100644
--- a/src/libqof/qof/gnc-numeric.c
+++ b/src/libqof/qof/gnc-numeric.c
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <stdint.h>
#include "gnc-numeric.h"
@@ -40,10 +41,13 @@
/* static short module = MOD_ENGINE; */
static const gint64 pten[] = { 1, 10, 100, 1000, 10000, 100000, 1000000,
- 10000000, 100000000, 1000000000, 10000000000,
- 100000000000, 1000000000000, 10000000000000,
- 100000000000000, 10000000000000000,
- 100000000000000000, 1000000000000000000};
+ 10000000, 100000000, 1000000000,
+ INT64_C(10000000000), INT64_C(100000000000),
+ INT64_C(1000000000000), INT64_C(10000000000000),
+ INT64_C(100000000000000),
+ INT64_C(10000000000000000),
+ INT64_C(100000000000000000),
+ INT64_C(1000000000000000000)};
#define POWTEN_OVERFLOW -5
static inline gint64
commit 08a4394955fdc39524e84db6a89c3ea6fc241d12
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 14 16:36:53 2014 -0800
Correct inadvertent change to a still-needed function.
diff --git a/src/libqof/qof/gnc-date.c b/src/libqof/qof/gnc-date.c
index e49be5c..a62c750 100644
--- a/src/libqof/qof/gnc-date.c
+++ b/src/libqof/qof/gnc-date.c
@@ -126,7 +126,7 @@ gnc_g_date_time_new_local (gint year, gint month, gint day, gint hour, gint minu
}
static GDateTime*
-g_date_time_adjust_for_dst (GDateTime *gdt, GTimeZone *tz)
+gnc_g_date_time_adjust_for_dst (GDateTime *gdt, GTimeZone *tz)
{
GDateTime *ngdt;
g_return_val_if_fail (gdt != NULL, NULL);
@@ -142,6 +142,8 @@ gnc_g_date_time_new_from_unix_local (time64 time)
{
GTimeZone *tz = gnc_g_time_zone_new_local ();
GDateTime *gdt = g_date_time_new_from_unix_utc (time);
+ if (gdt)
+ gdt = gnc_g_date_time_adjust_for_dst (gdt, tz);
return gdt;
}
@@ -151,7 +153,7 @@ gnc_g_date_time_new_from_timeval_local (const GTimeVal* tv)
GTimeZone *tz = gnc_g_time_zone_new_local ();
GDateTime *gdt = g_date_time_new_from_timeval_utc (tv);
if (gdt)
- gdt = g_date_time_adjust_for_dst (gdt, tz);
+ gdt = gnc_g_date_time_adjust_for_dst (gdt, tz);
return gdt;
}
@@ -161,7 +163,7 @@ gnc_g_date_time_new_now_local (void)
GTimeZone *tz = gnc_g_time_zone_new_local ();
GDateTime *gdt = g_date_time_new_now_utc ();
if (gdt)
- gdt = g_date_time_adjust_for_dst (gdt, tz);
+ gdt = gnc_g_date_time_adjust_for_dst (gdt, tz);
return gdt;
}
@@ -173,7 +175,7 @@ gnc_g_date_time_to_local (GDateTime* gdt)
if (gdt)
{
tz = gnc_g_time_zone_new_local ();
- gdt = g_date_time_adjust_for_dst (g_date_time_to_utc (gdt), tz);
+ gdt = gnc_g_date_time_adjust_for_dst (g_date_time_to_utc (gdt), tz);
}
return gdt;
}
@@ -193,7 +195,7 @@ void
_gnc_date_time_init (_GncDateTime *gncdt)
{
gncdt->new_local = gnc_g_date_time_new_local;
- gncdt->adjust_for_dst = g_date_time_adjust_for_dst;
+ gncdt->adjust_for_dst = gnc_g_date_time_adjust_for_dst;
gncdt->new_from_unix_local = gnc_g_date_time_new_from_unix_local;
gncdt->new_from_timeval_local = gnc_g_date_time_new_from_timeval_local;
gncdt->new_now_local = gnc_g_date_time_new_now_local;
Summary of changes:
src/gnome-utils/test/Makefile.am | 1 +
src/libqof/qof/gnc-date.c | 12 +++++++-----
src/libqof/qof/gnc-numeric.c | 12 ++++++++----
src/report/report-gnome/test/Makefile.am | 2 ++
src/report/report-system/test/Makefile.am | 1 +
src/report/standard-reports/test/Makefile.am | 2 ++
src/report/utility-reports/test/Makefile.am | 1 +
7 files changed, 22 insertions(+), 9 deletions(-)
More information about the gnucash-changes
mailing list