Continue reforming error message support. In this phase, rename

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

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 7712df83d903cb81c578a9fbdee5f1ad0b52e97e..e66035d4f01af6f6585903c71c4a5be68258d94e 100644 (file)
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -22,21 +22,21 @@
 #include <signal.h>
 #include <stdio.h>
 #include "command-line.h"
-#include "command.h"
-#include "compiler.h"
-#include "dictionary.h"
-#include "message.h"
-#include "file-handle-def.h"
-#include "filename.h"
-#include "line-buffer.h"
-#include "lexer.h"
-#include "output.h"
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <data/file-handle-def.h>
+#include <data/file-name.h>
+#include <language/line-buffer.h>
+#include <language/lexer/lexer.h>
+#include <output/output.h>
 #include "progname.h"
-#include "random.h"
+#include <math/random.h>
 #include "read-line.h"
-#include "settings.h"
-#include "variable.h"
-#include "version.h"
+#include <data/settings.h>
+#include <data/variable.h>
+#include <libpspp/version.h>
 
 #if HAVE_FPU_CONTROL_H
 #include <fpu_control.h>
@@ -55,8 +55,6 @@
 
 #include <stdlib.h>
 
-#include "debug-print.h"
-
 static void i18n_init (void);
 static void fpu_init (void);
 static void handle_error (int code);
@@ -255,7 +253,7 @@ terminate (bool success)
     return;
   terminating = true;
 
-  err_done ();
+  msg_done ();
   outp_done ();
 
   cancel_transformations ();