Continue reforming error message support. In this phase, rename

[pspp-builds.git] / src / language / command.c

diff --git a/src/language/command.c b/src/language/command.c
index 397097ab70e40c6bba4410f41079fe4688ca8fbd..c9e93cc9ed258ee25125cdd7703fed937f909832 100644 (file)
--- a/src/language/command.c
+++ b/src/language/command.c
@@ -18,27 +18,24 @@
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
-#include "command.h"
+#include <libpspp/message.h>
+#include <language/command.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#include "alloc.h"
-#include "compiler.h"
-#include "dictionary.h"
-#include "message.h"
-#include "lexer.h"
-#include "settings.h"
-#include "manager.h"
-#include "str.h"
-#include "table.h"
-#include "variable.h"
-#include "procedure.h"
-
-#if HAVE_UNISTD_H
 #include <unistd.h>
-#endif
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <data/settings.h>
+#include <output/manager.h>
+#include <libpspp/str.h>
+#include <output/table.h>
+#include <data/variable.h>
+#include <procedure.h>
 
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
@@ -244,10 +241,10 @@ cmd_parse (void)
     int result;
     
     /* Call the command dispatcher. */
-    err_set_command_name (cp->name);
+    msg_set_command_name (cp->name);
     tab_set_command_name (cp->name);
     result = cp->func ();
-    err_set_command_name (NULL);
+    msg_set_command_name (NULL);
     tab_set_command_name (NULL);
     
     /* Perform the state transition if the command completed