Fixed warnings generated by gcc 4.1.2

[pspp] / src / language / utilities / include.c

diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c
index aab817cb5b07e5d2cb1cd79da2a069e1b9704331..19f5c2e281e20a531e2bafa687495323d337b3bc 100644 (file)
--- a/src/language/utilities/include.c
+++ b/src/language/utilities/include.c
@@ -20,12 +20,12 @@
 #include <config.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "message.h"
-#include "line-buffer.h"
-#include "lexer.h"
-#include "str.h"
+#include <libpspp/alloc.h>
+#include <language/command.h>
+#include <libpspp/message.h>
+#include <language/line-buffer.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/str.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -37,13 +37,13 @@ cmd_include (void)
   if (lex_match_id ("FILE"))
     lex_match ('=');
 
-  /* Filename can be identifier or string. */
+  /* File name can be identifier or string. */
   if (token != T_ID && token != T_STRING) 
     {
-      lex_error (_("expecting filename")); 
+      lex_error (_("expecting file name")); 
       return CMD_CASCADING_FAILURE;
     }
-  getl_include_syntax_file (ds_c_str (&tokstr));
+  getl_include_syntax_file (ds_cstr (&tokstr));
 
   lex_get ();
   return lex_end_of_command ();