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 45910d84f1491da8041cf2b441980de1edc7f6b6..c9e93cc9ed258ee25125cdd7703fed937f909832 100644 (file)
--- a/src/language/command.c
+++ b/src/language/command.c
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
+#include <unistd.h>
 #include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <data/dictionary.h>
@@ -36,10 +37,6 @@
 #include <data/variable.h>
 #include <procedure.h>
 
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
@@ -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