summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjosh.macdonald <jmacd@users.noreply.github.com>2013-02-09 09:36:58 +0000
committerjosh.macdonald <jmacd@users.noreply.github.com>2013-02-09 09:36:58 +0000
commitd9e99f91af7e5c52a9b5cbb998c26271249fe5b6 (patch)
treef0acd6c787567025b0c840dbd7e6e5ea1791309d
parent9b74e9d590b431e0fb48881fcccb0f5d099bdf6a (diff)
Fix for printf warnings (independent of 32/64bit)
-rw-r--r--xdelta3/config.h.in3
-rw-r--r--xdelta3/configure.ac1
-rw-r--r--xdelta3/xdelta3-main.h3
-rw-r--r--xdelta3/xdelta3.h4
4 files changed, 10 insertions, 1 deletions
diff --git a/xdelta3/config.h.in b/xdelta3/config.h.in
index f01f64a..45309d0 100644
--- a/xdelta3/config.h.in
+++ b/xdelta3/config.h.in
@@ -54,5 +54,8 @@
54/* Define to the version of this package. */ 54/* Define to the version of this package. */
55#undef PACKAGE_VERSION 55#undef PACKAGE_VERSION
56 56
57/* The size of `size_t', as computed by sizeof. */
58#undef SIZEOF_SIZE_T
59
57/* Define to 1 if you have the ANSI C header files. */ 60/* Define to 1 if you have the ANSI C header files. */
58#undef STDC_HEADERS 61#undef STDC_HEADERS
diff --git a/xdelta3/configure.ac b/xdelta3/configure.ac
index 1feb7dd..79ffc2a 100644
--- a/xdelta3/configure.ac
+++ b/xdelta3/configure.ac
@@ -10,6 +10,7 @@ AC_PROG_CC
10AC_PROG_CXX 10AC_PROG_CXX
11AC_CHECK_HEADERS([lzma.h]) 11AC_CHECK_HEADERS([lzma.h])
12AC_CHECK_LIB(lzma, lzma_easy_buffer_encode) 12AC_CHECK_LIB(lzma, lzma_easy_buffer_encode)
13AC_CHECK_SIZEOF(size_t)
13#AM_PATH_PYTHON(,, [:]) 14#AM_PATH_PYTHON(,, [:])
14#AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) 15#AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
15#AX_PYTHON_DEVEL() 16#AX_PYTHON_DEVEL()
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index fcef08d..8d32938 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -352,7 +352,8 @@ xprintf (const char *fmt, ...)
352 if (xprintf_message_func != NULL) { 352 if (xprintf_message_func != NULL) {
353 xprintf_message_func(buf); 353 xprintf_message_func(buf);
354 } else { 354 } else {
355 fwrite(buf, 1, size, stderr); 355 size_t ignore = fwrite(buf, 1, size, stderr);
356 (void) ignore;
356 } 357 }
357} 358}
358 359
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 9c42318..e4d02b6 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -157,7 +157,11 @@ typedef uint64_t xoff_t;
157#define SIZEOF_XOFF_T 8 157#define SIZEOF_XOFF_T 8
158#define SIZEOF_USIZE_T 4 158#define SIZEOF_USIZE_T 4
159#ifndef WIN32 159#ifndef WIN32
160#if SIZEOF_SIZE_T == 8
161#define Q "z"
162#else
160#define Q "ll" 163#define Q "ll"
164#endif
161#else 165#else
162#define Q "I64" 166#define Q "I64"
163#endif 167#endif