Merge commit 'origin/stable'

[pspp-builds.git] / src / ui / terminal / msg-ui.c

diff --git a/src/ui/terminal/msg-ui.c b/src/ui/terminal/msg-ui.c
index fb0e7557e2e017da38c9b4c41f8715b3122a0ba2..682d753d8fbd36200f68e33677c239e5ef5b6c17 100644 (file)
--- a/src/ui/terminal/msg-ui.c
+++ b/src/ui/terminal/msg-ui.c
@@ -18,7 +18,7 @@
 
 #include "msg-ui.h"
 
-#include "linebreak.h"
+#include "unilbrk.h"
 #include "localcharset.h"
 
 #include <libpspp/msg-locator.h>
@@ -224,7 +224,7 @@ dump_message (char *msg, unsigned width, unsigned indent,
   /* Break into lines. */
   if (indent > width / 3)
     indent = width / 3;
-  mbs_width_linebreaks (string, length,
+  ulc_width_linebreaks (string, length,
                         width - indent, -indent, 0,
                         NULL, locale_charset (), breaks);
 
@@ -267,7 +267,7 @@ write_stream (int line_indent, struct substring line, void *stream_)
 
 /* Writes LINE to the journal. */
 static void
-write_journal (int line_indent, struct substring line, void *unused UNUSED)
+write_journal (int line_indent UNUSED, struct substring line, void *unused UNUSED)
 {
   char *s = xstrndup (ss_data (line), ss_length (line));
   journal_write (true, s);