X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=blobdiff_plain;f=src%2Fdata%2Fdata-in.h;h=5256bb9132553b46075f4f5526c20f8e936f7e8f;hp=d66b1c644903cd9795821c03e2ad71da453eea71;hb=9254d30d06a0565c89daccedd93a94c4c6086004;hpb=a9acce47d67e0ab35ce1690e4f1b1ac0121c2d78

diff --git a/src/data/data-in.h b/src/data/data-in.h
index d66b1c64..5256bb91 100644
--- a/src/data/data-in.h
+++ b/src/data/data-in.h
@@ -18,21 +18,17 @@
 #define DATA_DATA_IN_H 1
 
 #include <stdbool.h>
-#include <data/format.h>
 #include <libpspp/legacy-encoding.h>
 #include <libpspp/float-format.h>
 #include <libpspp/integer-format.h>
 #include <libpspp/str.h>
+#include <data/format.h>
 
-enum integer_format data_in_get_integer_format (void);
-void data_in_set_integer_format (enum integer_format);
-
-enum float_format data_in_get_float_format (void);
-void data_in_set_float_format (enum float_format);
-
+enum fmt_type;
 union value;
-bool data_in (struct substring input, enum legacy_encoding,
-              enum fmt_type, int implied_decimals, int first_column,
+bool data_in (struct substring input, const char *encoding,
+              enum fmt_type, int implied_decimals,
+              int first_column, int last_column,
               union value *output, int width);
 
 #endif /* data/data-in.h */