Modifying Scott's 64bit patch to work on OSX

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@11991 57a11ea4-9604-0410-9ed3-97b8803252fd

ChangeLog

@@ -1,3 +1,9 @@
+2005-11-20  Neil Williams  <linux@codehelp.co.uk>
+
+	* src/core-utils/gnc-gkeyfile-utils.c : Modifying Scott's
+	64bit patch to retain compatibility with OSX.
+	* doc/build-osx.txt : Updating build advice for OSX.
+
 2005-11-20  David Hampton  <hampton@employees.org>
 
 	* TRANSLATORS:

doc/build-osx.txt

@@ -9,7 +9,7 @@ in preference to the newly installed GNU version.
 
 To avoid these problems, you are advised to change your PATH variable
 in ~/.bashrc to put the Fink binaries ahead of the main OSX binaries
-in your path:
+in your path or export a new PATH in the script that calls autogen.sh.
 Instead of:
 \verbatim
 PATH=/usr/bin/:/sbin/:/usr/sbin/:/bin:/opt/local/bin:/sw/bin
@@ -19,7 +19,7 @@ use:
 PATH=/sw/bin:/usr/bin/:/sbin/:/usr/sbin/:/bin:/opt/local/bin
 /endverbatim
 
-Then, when calling ./autogen.sh and ./configure, it may be necessary
+Then, when calling ./autogen.sh and ./configure, it is necessary
 to direct OSX to the correct Guile installation environment using:
 
 \verbatim
@@ -28,12 +28,6 @@ guile16-build env LIBRARY_PATH=/sw/lib CPATH=/sw/include \
 ./autogen.sh
 guile16-build env LIBRARY_PATH=/sw/lib CPATH=/sw/include \
 ./configure <your configure options>
-\endverbatim
-
-You may also need to specify the same environment to the first
-make command:
-
-\verbatim
 guile16-build env LIBRARY_PATH=/sw/lib CPATH=/sw/include \
 make
 \endverbatim
@@ -41,6 +35,9 @@ make
 If (when) you do a 'make distclean', this whole process will have to
 be done again.
 
+If you have to change automake or autoconf versions, make sure you
+remove the autom4te.cache/ directory before running autogen.sh again.
+
 \section osxtools OSX tools
 
 GnuCash recommends <b>only>/b> the most recent versions of each of the 

src/core-utils/gnc-gkeyfile-utils.c

@@ -122,10 +122,10 @@ gnc_key_file_save_to_file (const gchar *filename,
     success = FALSE;
     if (error) {
       *error = g_error_new(G_FILE_ERROR, g_file_error_from_errno(errno), 
-			   "File %s truncated (provided %d, written %zd)",
+			   "File %s truncated (provided %d, written %d)",
 			   filename, length, written);
     } else {
-      g_critical("File %s truncated (provided %d, written %zd)",
+      g_critical("File %s truncated (provided %d, written %d)",
 	      filename, length, written);
     }
     /* Ignore any error */