/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#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
if (settings_get_errorbreak () && error_count)
msg (MN, _("Terminating execution of syntax file due to error."));
else if (error_count > settings_get_mxerrs () )
- msg (MN, _("Errors (%d) exceeds limit (%d)."),
+ msg (MN, _("Errors (%d) exceed limit (%d)."),
error_count, settings_get_mxerrs ());
else if (error_count + warning_count > settings_get_mxwarns () )
msg (MN, _("Warnings (%d) exceed limit (%d)."),
/* 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);