gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/c5de3a9c (commit)
	 via  https://github.com/Gnucash/gnucash/commit/b0879931 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/33c4facf (commit)
	 via  https://github.com/Gnucash/gnucash/commit/dbd8a563 (commit)
	from  https://github.com/Gnucash/gnucash/commit/620114af (commit)



commit c5de3a9c460313520d3b83b6a240c2e93f35833c
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jun 2 17:38:49 2014 -0700

    Fix broken win32 build; MinGW needs our strptime.

diff --git a/src/plugins/bi_import/dialog-bi-import-helper.c b/src/plugins/bi_import/dialog-bi-import-helper.c
index 9a0a48c..8fbddb9 100644
--- a/src/plugins/bi_import/dialog-bi-import-helper.c
+++ b/src/plugins/bi_import/dialog-bi-import-helper.c
@@ -25,6 +25,10 @@
 
 #include "dialog-bi-import-helper.h"
 #include <ctype.h>
+#include <time.h>
+#ifndef HAVE_STRPTIME
+#include <strptime.h>
+#endif
 
 //! \brief helper function
 gboolean text2bool( const gchar *text )

commit b08799314e63ca300bacdd759e0fddca127efd2e
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jun 2 13:37:24 2014 -0700

    722200 - configure script does not pick the correct am_cv_scanf version
    
    Different tack: Use G_GUINT64_FORMAT in guid.c instead of messing with
    defining __USE_MINGW_ANSI_STDIO

diff --git a/src/libqof/qof/guid.c b/src/libqof/qof/guid.c
index 2868511..67c619a 100644
--- a/src/libqof/qof/guid.c
+++ b/src/libqof/qof/guid.c
@@ -247,7 +247,8 @@ init_from_file(const char *filename, size_t max_size)
     file_bytes = init_from_stream(fp, max_size);
 
 #ifdef HAVE_SCANF_LLD
-    PINFO ("guid_init got %llu bytes from %s", (unsigned long long int) file_bytes,
+    PINFO ("guid_init got %" G_GUINT64_FORMAT " bytes from %s",
+	   (unsigned long long int) file_bytes,
            filename);
 #else
     PINFO ("guid_init got %lu bytes from %s", (unsigned long int) file_bytes,
@@ -513,21 +514,12 @@ guid_init(void)
     /* time in secs and clock ticks */
     bytes += init_from_time();
 
-#ifdef HAVE_SCANF_LLD
-    PINFO ("got %llu bytes", (unsigned long long int) bytes);
+    PINFO ("got %" G_GUINT64_FORMAT " bytes", (unsigned long long int) bytes);
 
     if (bytes < THRESHOLD)
-        PWARN("only got %llu bytes.\n"
+        PWARN("only got %" G_GUINT64_FORMAT " bytes.\n"
               "The identifiers might not be very random.\n",
               (unsigned long long int)bytes);
-#else
-    PINFO ("got %lu bytes", (unsigned long int) bytes);
-
-    if (bytes < THRESHOLD)
-        PWARN("only got %lu bytes.\n"
-              "The identifiers might not be very random.\n",
-              (unsigned long int)bytes);
-#endif
 
     guid_initialized = TRUE;
     LEAVE();

commit 33c4facfc71bef579ae49818daf5e8773e0217d3
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jun 2 12:48:45 2014 -0700

    Revert "722200 - configure script does not pick the correct am_cv_scanf version"
    
    This reverts commit f9548652de6b0684d818bc5bd147942453dd8886.

diff --git a/configure.ac b/configure.ac
index 812da91..be11ca1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -392,12 +392,6 @@ update to latest  darwin])
           ], [AC_MSG_RESULT(no)])
         LIBS="${saved_LIBS}"
         AC_SUBST(HTMLHELP_LIBS)
-
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-#include <stdio.h>
-	 ], [
-    printf("%lld\n", 3);
-         ])],[],[AC_DEFINE([__USE_MINGW_ANSI_STDIO], 1, [MinGW needs ANSI_STDIO hack.])])
         ;;
       *)
         AC_MSG_RESULT(no)

commit dbd8a5638c791ae19418e04260f138dadea2acdd
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jun 2 12:48:32 2014 -0700

    Revert "722200 - configure script does not pick the correct am_cv_scanf version"
    
    This reverts commit f3e76fb9df0c4b1276909a8f33421ee6c79f5455.

diff --git a/configure.ac b/configure.ac
index 0feb2c6..812da91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -393,14 +393,11 @@ update to latest  darwin])
         LIBS="${saved_LIBS}"
         AC_SUBST(HTMLHELP_LIBS)
 
-	saved_CFLAGS="${CFLAGS}"
-	CFLAGS="${CFLAGS} -Wall -Werror"
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
 #include <stdio.h>
 	 ], [
     printf("%lld\n", 3);
          ])],[],[AC_DEFINE([__USE_MINGW_ANSI_STDIO], 1, [MinGW needs ANSI_STDIO hack.])])
-	CFLAGS="${saved_CFLAGS}"
         ;;
       *)
         AC_MSG_RESULT(no)



Summary of changes:
 configure.ac                                    |  9 ---------
 src/libqof/qof/guid.c                           | 16 ++++------------
 src/plugins/bi_import/dialog-bi-import-helper.c |  4 ++++
 3 files changed, 8 insertions(+), 21 deletions(-)