X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fdata-in.h;h=3ebd5933c43b0370e29cfd279cd3b22fcdbb0b4d;hb=b3b8cd820da3100f7ad474a5ab88e2737da18d1b;hp=779e8374fa466e9c724d56b912955074a20add22;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp
diff --git a/src/data/data-in.h b/src/data/data-in.h
index 779e8374fa..3ebd5933c4 100644
--- 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 . */
-#if !data_in_h
-#define data_in_h 1
+#ifndef DATA_DATA_IN_H
+#define DATA_DATA_IN_H 1
-#include
#include
+#include
#include
#include
#include
-#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
+
+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 */