[Gnucash-changes] r13764 - gnucash/trunk - Create a QOF_SCANF_LLD (because we cannot use the printf version).

[Derek Atkins]

Author: warlord
Date: 2006-04-10 18:13:46 -0400 (Mon, 10 Apr 2006)
New Revision: 13764
Trac: http://svn.gnucash.org/trac/changeset/13764

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/lib/libqof/qof/deprecated.h
   gnucash/trunk/lib/libqof/qof/qofutil.h
Log:
Create a QOF_SCANF_LLD (because we cannot use the printf version).
Keep the deprecated GNC_SCANF_LLD defined in terms of the new
QOF_SCANF_LLD.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-04-10 21:49:44 UTC (rev 13763)
+++ gnucash/trunk/ChangeLog	2006-04-10 22:13:46 UTC (rev 13764)
@@ -12,6 +12,12 @@
 	  lots of other stuff that has nothing to do with glib.h.  Note
 	  that this revision wont build, but I'll fix that shortly.
 
+	* lib/libqof/qof/deprecated.h:
+	* lib/libqof/qof/qofutil.h:
+	  Create a QOF_SCANF_LLD (because we cannot use the printf version).
+	  Keep the deprecated GNC_SCANF_LLD defined in terms of the new
+	  QOF_SCANF_LLD.
+
 2006-04-08  David Hampton  <hampton at employees.org>
 
 	* src/gnome-utils/account-quickfill.c: Eliminate some unnecessary

Modified: gnucash/trunk/lib/libqof/qof/deprecated.h
===================================================================
--- gnucash/trunk/lib/libqof/qof/deprecated.h	2006-04-10 21:49:44 UTC (rev 13763)
+++ gnucash/trunk/lib/libqof/qof/deprecated.h	2006-04-10 22:13:46 UTC (rev 13764)
@@ -169,11 +169,7 @@
 #define SAFE_STRCASECMP(da,db) SAFE_STRCMP_REAL(strcasecmp,(da),(db))
 /** \deprecated use qof_util_string_cache_insert instead. */
 gpointer gnc_string_cache_insert(gconstpointer key);
-#if HAVE_SCANF_LLD
-# define GNC_SCANF_LLD "%lld" /**< \deprecated use G_GINT64_FORMAT instead. */
-#else
-# define GNC_SCANF_LLD "%qd"  /**< \deprecated use G_GINT64_FORMAT instead. */
-#endif
+#define GNC_SCANF_LLD QOF_SCANF_LLD /**< \deprecated use QOF_SCANF_LLD instead. */
 /** \deprecated use qof_util_stpcpy instead. */
 gchar * gnc_stpcpy (gchar *dest, const gchar *src);
 /** \deprecated use qof_init instead. */

Modified: gnucash/trunk/lib/libqof/qof/qofutil.h
===================================================================
--- gnucash/trunk/lib/libqof/qof/qofutil.h	2006-04-10 21:49:44 UTC (rev 13763)
+++ gnucash/trunk/lib/libqof/qof/qofutil.h	2006-04-10 22:13:46 UTC (rev 13764)
@@ -40,6 +40,13 @@
 #include "qofbook.h"
 #include "qofinstance.h"
 
+/** Do not use these for printf, only scanf */
+#if HAVE_SCANF_LLD
+# define QOF_SCANF_LLD "%lld"
+#else
+# define QOF_SCANF_LLD "%qd"
+#endif
+
 #define QOF_MOD_UTIL "qof-utilities"
 
 /** \name typedef enum as string macros