projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[pspp]
/
src
/
language
/
dictionary
/
attributes.c
diff --git
a/src/language/dictionary/attributes.c
b/src/language/dictionary/attributes.c
index 135207306f528b1f16b027762d355f99aba53065..fc9cc9a5d28b72dd7b86701fb1cf42557b66a9f0 100644
(file)
--- a/
src/language/dictionary/attributes.c
+++ b/
src/language/dictionary/attributes.c
@@
-19,8
+19,8
@@
#include <stdlib.h>
#include "data/attributes.h"
#include <stdlib.h>
#include "data/attributes.h"
+#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/dictionary.h"
-#include "data/procedure.h"
#include "data/variable.h"
#include "language/command.h"
#include "language/lexer/lexer.h"
#include "data/variable.h"
#include "language/command.h"
#include "language/lexer/lexer.h"
@@
-197,7
+197,7
@@
parse_attributes (struct lexer *lexer, const char *dict_encoding,
command = DELETE;
else if (command == UNKNOWN)
{
command = DELETE;
else if (command == UNKNOWN)
{
- lex_error
(lexer, _("expecting %s or %s"), "ATTRIBUTE=", "DELETE="
);
+ lex_error
_expecting (lexer, "ATTRIBUTE=", "DELETE=", NULL_SENTINEL
);
return CMD_FAILURE;
}
return CMD_FAILURE;
}