[Expat-checkins] expat/xmlwf xmlwf.c,1.68,1.69

[Karl Waclawek]

Update of /cvsroot/expat/expat/xmlwf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16319

Modified Files:
	xmlwf.c 
Log Message:
* Added integer modifier macro to support 64-bit integers in printf.
* Made include directives to be in sync with xmlparse.c.

Index: xmlwf.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- xmlwf.c	24 Dec 2005 06:35:04 -0000	1.68
+++ xmlwf.c	25 Dec 2005 16:56:05 -0000	1.69
@@ -7,6 +7,16 @@
 #include <stddef.h>
 #include <string.h>
 
+#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 <expat_config.h>
+#endif /* ndef COMPILED_FROM_DSP */
+
 #include "expat.h"
 #include "codepage.h"
 #include "xmlfile.h"
@@ -309,7 +319,8 @@
   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),