projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
data
/
data-in.h
diff --git
a/src/data/data-in.h
b/src/data/data-in.h
index 3a8d67cc22f66b28eb0bed54126e5a3255449064..3ebd5933c43b0370e29cfd279cd3b22fcdbb0b4d 100644
(file)
--- a/
src/data/data-in.h
+++ b/
src/data/data-in.h
@@
-26,9
+26,11
@@
enum fmt_type;
union value;
enum fmt_type;
union value;
-bool data_in (struct substring input, enum legacy_encoding,
+struct dictionary;
+bool data_in (struct substring input, const char *encoding,
enum fmt_type, int implied_decimals,
int first_column, int last_column,
enum fmt_type, int implied_decimals,
int first_column, int last_column,
+ const struct dictionary *dict,
union value *output, int width);
#endif /* data/data-in.h */
union value *output, int width);
#endif /* data/data-in.h */