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
This commit is contained in:
John Ralls 2014-06-02 13:37:24 -07:00
parent 33c4facfc7
commit b08799314e

View File

@ -247,7 +247,8 @@ init_from_file(const char *filename, size_t max_size)
file_bytes = init_from_stream(fp, max_size); file_bytes = init_from_stream(fp, max_size);
#ifdef HAVE_SCANF_LLD #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); filename);
#else #else
PINFO ("guid_init got %lu bytes from %s", (unsigned long int) file_bytes, 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 */ /* time in secs and clock ticks */
bytes += init_from_time(); bytes += init_from_time();
#ifdef HAVE_SCANF_LLD PINFO ("got %" G_GUINT64_FORMAT " bytes", (unsigned long long int) bytes);
PINFO ("got %llu bytes", (unsigned long long int) bytes);
if (bytes < THRESHOLD) 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", "The identifiers might not be very random.\n",
(unsigned long long int)bytes); (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; guid_initialized = TRUE;
LEAVE(); LEAVE();