* Added integer modifier macro to support 64-bit integers in printf.
* Made include directives of configuration header files sync'ed
with xmlparse.c.
diff --git a/expat/xmlwf/xmlfile.c b/expat/xmlwf/xmlfile.c
index edcf1a5..88bb396 100755
--- a/expat/xmlwf/xmlfile.c
+++ b/expat/xmlwf/xmlfile.c
@@ -7,13 +7,17 @@
#include <stddef.h>
#include <string.h>
#include <fcntl.h>
+
#ifdef COMPILED_FROM_DSP
#include "winconfig.h"
-#else
-#ifdef HAVE_EXPAT_CONFIG_H
-#include "expat_config.h"
-#endif
-#endif
+#elif defined(MACOS_CLASSIC)
+#include "macconfig.h"
+#elif defined(__amigaos4__)
+#include "amigaconfig.h"
+#elif defined(HAVE_EXPAT_CONFIG_H)
+#include <expat_config.h>
+#endif /* ndef COMPILED_FROM_DSP */
+
#include "expat.h"
#include "xmlfile.h"
#include "xmltchar.h"
@@ -57,7 +61,7 @@
enum XML_Error code = XML_GetErrorCode(parser);
const XML_Char *message = XML_ErrorString(code);
if (message)
- ftprintf(stdout, T("%s:%d:%d: %s\n"),
+ ftprintf(stdout, T("%s:%" XML_FMT_INT_MOD "u:%" XML_FMT_INT_MOD "u: %s\n"),
filename,
XML_GetErrorLineNumber(parser),
XML_GetErrorColumnNumber(parser),