X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmsg-ui.c;h=1a5e2764be12579b308c29b60e7cfbe47cac518a;hb=dfd1972f7bcb550a4fc3b05dbe7e71d12334b0a7;hp=682d753d8fbd36200f68e33677c239e5ef5b6c17;hpb=c9a3c45e44c1c03d13d4eb186e3817bc836f75f8;p=pspp-builds.git

diff --git a/src/ui/terminal/msg-ui.c b/src/ui/terminal/msg-ui.c
index 682d753d..1a5e2764 100644
--- a/src/ui/terminal/msg-ui.c
+++ b/src/ui/terminal/msg-ui.c
@@ -18,22 +18,24 @@
 
 #include "msg-ui.h"
 
-#include "unilbrk.h"
-#include "localcharset.h"
-
-#include <libpspp/msg-locator.h>
-#include <libpspp/getl.h>
 #include <data/settings.h>
+#include <libpspp/getl.h>
 #include <libpspp/message.h>
+#include <libpspp/msg-locator.h>
 #include <libpspp/str.h>
 #include <output/journal.h>
-#include <output/output.h>
-#include <output/table.h>
+#include <output/driver.h>
+#include <output/tab.h>
+
 #include <errno.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "unilbrk.h"
+#include "localcharset.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
@@ -187,9 +189,9 @@ handle_msg (const struct msg *m)
       /* Disable screen output devices, because the error should
          already have been reported to the screen with the
          dump_message call above. */
-      outp_enable_device (false, OUTP_DEV_SCREEN);
+      output_set_type_enabled (false, OUTPUT_DEVICE_SCREEN);
       tab_output_text (TAB_LEFT, ds_cstr (&string));
-      outp_enable_device (true, OUTP_DEV_SCREEN);
+      output_set_type_enabled (true, OUTPUT_DEVICE_SCREEN);
     }
 
   ds_destroy (&string);