Index: sfi/ChangeLog
===================================================================
--- sfi/ChangeLog	(revision 4358)
+++ sfi/ChangeLog	(working copy)
@@ -1,3 +1,16 @@
+Sat Jul 14 16:51:05 2007  Stefan Westerfeld  <stefan@space.twc.de>
+
+	* sfiwrapper.h: Remove cyclic include dependancy between sfiwrapper.h
+	and sfitypes.h by not longer including sfitypes.h. This will allow
+	using things defined here in sfitypes.h, which was not possible
+	before.
+
+	* sfitypes.h: Use int64 instead of gint64 for SfiTime/SfiNum, which
+	expands to long long on both, 32- and 64-bit systems. This will make
+	printf ("%lld", some_sfi_num) a valid printf format (as seen by gcc),
+	and thus some compiler warnings disappear with this change. Fixes:
+	#456879.
+
 Sat Jul 14 15:54:33 2007  Stefan Westerfeld  <stefan@space.twc.de>
 
 	* sfiwrapper.h: When compiled in C++ sources, use [u]int16/32/...
Index: sfi/sfiwrapper.h
===================================================================
--- sfi/sfiwrapper.h	(revision 4358)
+++ sfi/sfiwrapper.h	(working copy)
@@ -18,7 +18,6 @@
 #define __SFI_WRAPPER_H__
 
 #include <stdbool.h>
-#include <sfi/sfitypes.h>
 #include <sfi/glib-extra.h>
 #include <birnet/birnetcdefs.h> /* include glib before birnet for G_LOG_DOMAIN */
 
Index: sfi/sfitypes.h
===================================================================
--- sfi/sfitypes.h	(revision 4357)
+++ sfi/sfitypes.h	(working copy)
@@ -27,10 +27,10 @@ typedef bool			SfiBool;
 typedef gint			SfiInt;
 #define	SFI_MAXINT		(+2147483647)
 #define	SFI_MININT		(-SFI_MAXINT - 1)
-typedef gint64			SfiNum;
+typedef int64			SfiNum;
 #define	SFI_MAXNUM		((SfiNum) +9223372036854775807LL)
 #define	SFI_MINNUM		(-SFI_MAXNUM - 1)
-typedef gint64			SfiTime;
+typedef int64			SfiTime;
 typedef SfiInt			SfiNote;
 typedef double			SfiReal;
 #define SFI_MINREAL		(2.2250738585072014e-308)	/* IEEE754 double */
