diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2020-10-15 22:47:35 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2020-10-16 13:02:23 +0200 |
| commit | ff65e272a8f8e647a3db5187e5c4594ff01cbd34 (patch) | |
| tree | cb86bf74c0b5c6d1d1f49a3dbcf519ac4fe3cbe2 /qpdf | |
| parent | be21ede7ba05027829adaf7275e9bbbc1574a760 (diff) | |
| download | qpdf-ff65e272a8f8e647a3db5187e5c4594ff01cbd34.tar.zst | |
Fix printf formatting for newer msvc
Use autoconf rather than ifdefs to determine what format string to use
for long long.
Diffstat (limited to 'qpdf')
| -rw-r--r-- | qpdf/build.mk | 2 | ||||
| -rw-r--r-- | qpdf/qpdf-ctest.c | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/qpdf/build.mk b/qpdf/build.mk index a9dd7187..1bab58b7 100644 --- a/qpdf/build.mk +++ b/qpdf/build.mk @@ -48,7 +48,7 @@ $(foreach B,$(BINS_qpdf),$(eval \ $(foreach B,$(CBINS_qpdf),$(eval \ $(OBJS_$(B)): qpdf/$(OUTPUT_DIR)/%.$(OBJ): qpdf/$(B).c ; \ - $(call c_compile,qpdf/$(B).c,$(INCLUDES_qpdf)))) + $(call c_compile,qpdf/$(B).c,$(INCLUDES_qpdf),$(XCFLAGS_qpdf_$(B))))) $(foreach B,$(BINS_qpdf) $(CBINS_qpdf),$(eval \ qpdf/$(OUTPUT_DIR)/$(call binname,$(B)): $(OBJS_$(B)) ; \ diff --git a/qpdf/qpdf-ctest.c b/qpdf/qpdf-ctest.c index 579d5890..fad121af 100644 --- a/qpdf/qpdf-ctest.c +++ b/qpdf/qpdf-ctest.c @@ -4,6 +4,7 @@ #include <stdlib.h> #include <string.h> #include <errno.h> +#include "../libqpdf/qpdf/qpdf-config.h" // for LL_FMT static char* whoami = 0; static qpdf_data qpdf = 0; @@ -36,13 +37,7 @@ static FILE* safe_fopen(char const* filename, char const* mode) static void report_errors() { -#ifdef _WIN32 -# define POS_FMT " pos : %I64d\n" -#else -/* If your compiler doesn't support lld, change to ld and lose - precision on offsets in error messages. */ -# define POS_FMT " pos : %lld\n" -#endif +#define POS_FMT " pos : " LL_FMT "\n" qpdf_error e = 0; while (qpdf_more_warnings(qpdf)) { |