From d707e890ea0b2a10a37d5309d2ed427b4ae09560 Mon Sep 17 00:00:00 2001 From: Karl Waclawek Date: Sun, 25 Dec 2005 16:56:05 +0000 Subject: [PATCH] * Added integer modifier macro to support 64-bit integers in printf. * Made include directives to be in sync with xmlparse.c. --- expat/xmlwf/xmlwf.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/expat/xmlwf/xmlwf.c b/expat/xmlwf/xmlwf.c index 151f54ce..74d4525d 100755 --- a/expat/xmlwf/xmlwf.c +++ b/expat/xmlwf/xmlwf.c @@ -7,6 +7,16 @@ #include #include +#ifdef COMPILED_FROM_DSP +#include "winconfig.h" +#elif defined(MACOS_CLASSIC) +#include "macconfig.h" +#elif defined(__amigaos4__) +#include "amigaconfig.h" +#elif defined(HAVE_EXPAT_CONFIG_H) +#include +#endif /* ndef COMPILED_FROM_DSP */ + #include "expat.h" #include "codepage.h" #include "xmlfile.h" @@ -309,7 +319,8 @@ metaLocation(XML_Parser parser) if (uri) ftprintf((FILE *)XML_GetUserData(parser), T(" uri=\"%s\""), uri); ftprintf((FILE *)XML_GetUserData(parser), - T(" byte=\"%ld\" nbytes=\"%d\" line=\"%d\" col=\"%d\""), + T(" byte=\"%" XML_FMT_INT_MOD "d\" nbytes=\"%d\" \ + line=\"%" XML_FMT_INT_MOD "u\" col=\"%" XML_FMT_INT_MOD "u\""), XML_GetCurrentByteIndex(parser), XML_GetCurrentByteCount(parser), XML_GetCurrentLineNumber(parser), -- 2.40.0