projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Made psppire-conf thread safer"
[pspp-builds.git]
/
src
/
language
/
lexer
/
range-parser.c
diff --git
a/src/language/lexer/range-parser.c
b/src/language/lexer/range-parser.c
index e71bc299da236b1913779dc18fef16b5cdb5fac3..4cf21cf044ae2619bb395a2012748e5ba62a1647 100644
(file)
--- a/
src/language/lexer/range-parser.c
+++ b/
src/language/lexer/range-parser.c
@@
-20,9
+20,9
@@
#include <data/data-in.h>
#include <libpspp/message.h>
#include "lexer.h"
#include <data/data-in.h>
#include <libpspp/message.h>
#include "lexer.h"
-#include <libpspp/magic.h>
#include <libpspp/str.h>
#include <data/value.h>
#include <libpspp/str.h>
#include <data/value.h>
+#include <data/format.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-99,7
+99,8
@@
parse_number (struct lexer *lexer, double *x, const enum fmt_type *format)
else if (lex_token (lexer) == T_STRING && format != NULL)
{
union value v;
else if (lex_token (lexer) == T_STRING && format != NULL)
{
union value v;
- data_in (ds_ss (lex_tokstr (lexer)), *format, 0, 0, &v, 0);
+ data_in (ds_ss (lex_tokstr (lexer)), LEGACY_NATIVE,
+ *format, 0, 0, 0, &v, 0);
lex_get (lexer);
*x = v.f;
if (*x == SYSMIS)
lex_get (lexer);
*x = v.f;
if (*x == SYSMIS)