xmlwf|tests: Repeat L string prefix to fix compilation

diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 506c9630606ccfc9835c8c748a9cee0b286e95d4..8e26a785f736d059bed95842e3bf36d08785ec57 100644 (file)
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -5533,7 +5533,7 @@ START_TEST(test_param_entity_with_trailing_cr)
     XML_SetExternalEntityRefHandler(parser, external_entity_loader);
     XML_SetEntityDeclHandler(parser, param_entity_match_handler);
     entity_name_to_match = XCS(PARAM_ENTITY_NAME);
-    entity_value_to_match = XCS(PARAM_ENTITY_CORE_VALUE "\n");
+    entity_value_to_match = XCS(PARAM_ENTITY_CORE_VALUE) XCS("\n");
     entity_match_flag = ENTITY_MATCH_NOT_FOUND;
     if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text),
                                 XML_TRUE) == XML_STATUS_ERROR)

diff --git a/expat/xmlwf/xmlfile.c b/expat/xmlwf/xmlfile.c
index 232cc47d42451db3638762bc1720d3074b7bfbd8..4075f5710cad48ca28e27f9755956a141feb26ee 100644 (file)
--- a/expat/xmlwf/xmlfile.c
+++ b/expat/xmlwf/xmlfile.c
@@ -85,7 +85,11 @@ reportError(XML_Parser parser, const XML_Char *filename)
   enum XML_Error code = XML_GetErrorCode(parser);
   const XML_Char *message = XML_ErrorString(code);
   if (message)
-    ftprintf(stdout, T("%s:%" XML_FMT_INT_MOD "u:%" XML_FMT_INT_MOD "u: %s\n"),
+    ftprintf(stdout,
+             T("%s")
+               T(":%") T(XML_FMT_INT_MOD) T("u")
+               T(":%") T(XML_FMT_INT_MOD) T("u")
+               T(": %s\n"),
              filename,
              XML_GetErrorLineNumber(parser),
              XML_GetErrorColumnNumber(parser),

diff --git a/expat/xmlwf/xmlwf.c b/expat/xmlwf/xmlwf.c
index 9b1b4a0b20cee89631b85e59a7f2d9f570ee25be..82d028ea56fd6ba6e222d4351e8e946cce6a73e6 100644 (file)
--- a/expat/xmlwf/xmlwf.c
+++ b/expat/xmlwf/xmlwf.c
@@ -550,8 +550,10 @@ metaLocation(XML_Parser parser)
   if (uri)
     ftprintf(fp, T(" uri=\"%s\""), uri);
   ftprintf(fp,
-           T(" byte=\"%" XML_FMT_INT_MOD "d\" nbytes=\"%d\" \
-             line=\"%" XML_FMT_INT_MOD "u\" col=\"%" XML_FMT_INT_MOD "u\""),
+           T(" byte=\"%") T(XML_FMT_INT_MOD) T("d\"")
+             T(" nbytes=\"%d\"")
+             T(" line=\"%") T(XML_FMT_INT_MOD) T("u\"")
+             T(" col=\"%") T(XML_FMT_INT_MOD) T("u\""),
            XML_GetCurrentByteIndex(parser),
            XML_GetCurrentByteCount(parser),
            XML_GetCurrentLineNumber(parser),