Added a dict parameter to data_in and dealt with the consequences.

[pspp-builds.git] / src / data / data-in.h

diff --git a/src/data/data-in.h b/src/data/data-in.h
index 779e8374fa466e9c724d56b912955074a20add22..3ebd5933c43b0370e29cfd279cd3b22fcdbb0b4d 100644 (file)
--- a/src/data/data-in.h
+++ b/src/data/data-in.h
@@ -14,24 +14,23 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
-#if !data_in_h
-#define data_in_h 1
+#ifndef DATA_DATA_IN_H
+#define DATA_DATA_IN_H 1
 
-#include <stddef.h>
 #include <stdbool.h>
+#include <libpspp/legacy-encoding.h>
 #include <libpspp/float-format.h>
 #include <libpspp/integer-format.h>
 #include <libpspp/str.h>
-#include "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);
-
-bool data_in (struct substring input,
-              enum fmt_type, int implied_decimals, int first_column,
+#include <data/format.h>
+
+enum fmt_type;
+union value;
+struct dictionary;
+bool data_in (struct substring input, const char *encoding,
+              enum fmt_type, int implied_decimals,
+              int first_column, int last_column,
+             const struct dictionary *dict,
               union value *output, int width);
 
-#endif /* data-in.h */
+#endif /* data/data-in.h */