On Friday 21 April 2006 11:36 pm, Frederik Schueler wrote: > On Fri, Apr 21, 2006 at 07:45:20PM +0100, Neil Williams wrote: > > Could you test this patch for me? > > I would like to, but the patch does not apply. Investigating by hand, > it seems the diff is against an even newer version than in 0.6.4-1:
:-( The second patch I sent has been reported to fail by other 64bit testers so I've got - what I hope - is the proper solution and it's tested against the original source. Sorry for the hassle. I was considering a new machine anyway and it looks like it should be a 64bit system! :-) > If you need further help... :) I think so! -- Neil Williams ============= http://www.data-freedom.org/ http://www.nosoftwarepatents.com/ http://www.linux.codehelp.co.uk/
--- qof-0.6.4/qof/test/test-date.c 2005-10-23 12:58:18.000000000 +0100
+++ /opt/working/qof/qof/test/test-date.c 2006-04-22 19:35:09.000000000 +0100
@@ -61,15 +61,16 @@ check_time (Timespec ts, gboolean always
if (!ok || always_print)
{
fprintf (stderr,
- "\n%lld:%lld -> %s ->\n%lld:%lld "
- "(diff of %lld secs %lld nsecs)\n",
- (long long int) ts.tv_sec,
- (long long int) ts.tv_nsec,
+ "\n%" G_GINT64_FORMAT ":%ld -> %s ->\n"
+ "%" G_GINT64_FORMAT ":%ld "
+ "(diff of %" G_GINT64_FORMAT " secs %ld nsecs)\n",
+ ts.tv_sec,
+ ts.tv_nsec,
str,
- (long long int) ts_2.tv_sec,
- (long long int) ts_2.tv_nsec,
- (long long int) (ts.tv_sec - ts_2.tv_sec),
- (long long int) (ts.tv_nsec - ts_2.tv_nsec));
+ ts_2.tv_sec,
+ ts_2.tv_nsec,
+ (ts.tv_sec - ts_2.tv_sec),
+ (ts.tv_nsec - ts_2.tv_nsec));
if (!ok)
{
@@ -93,8 +94,8 @@ check_conversion (const char * str, Time
if ((expected_ts.tv_sec != ts.tv_sec) || (expected_ts.tv_nsec != ts.tv_nsec))
{
fprintf (stderr,
- "\nmis-converted \"%s\" to %lld.%09ld seconds\n"
- "\twas expecting %lld.%09ld seconds\n",
+ "\nmis-converted \"%s\" to %" G_GINT64_FORMAT ".%09ld seconds\n"
+ "\twas expecting %" G_GINT64_FORMAT ".%09ld seconds\n",
str, ts.tv_sec, ts.tv_nsec,
expected_ts.tv_sec, expected_ts.tv_nsec);
failure ("misconverted timespec");
pgpeKG7NIbvCi.pgp
Description: PGP signature
