X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fdata-in.h;h=6540004d2333921560c7437e83c42e78323c9469;hb=101250dc9f516758bd9d13f869f1a770d6dd1ca3;hp=af62b3aecba9ec019356d179005b8a633184de36;hpb=4e8efdc4acb80fc1a3735228d29fca0cf86fee6d;p=pspp

diff --git a/src/data/data-in.h b/src/data/data-in.h
index af62b3aecb..6540004d23 100644
--- a/src/data/data-in.h
+++ b/src/data/data-in.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,18 +19,21 @@
 
 #include <stdbool.h>
 #include "data/format.h"
-#include "libpspp/legacy-encoding.h"
 #include "libpspp/str.h"
 
 union value;
 struct dictionary;
 
-bool data_in (struct substring input, const char *encoding,
-               enum fmt_type, int first_column, int last_column,
-               const struct dictionary *dict,
-               union value *output, int width);
+char *data_in (struct substring input, const char *input_encoding,
+               enum fmt_type, const struct fmt_settings *,
+               union value *output, int width, const char *output_encoding);
+
+bool data_in_msg (struct substring input, const char *input_encoding,
+                  enum fmt_type, const struct fmt_settings *,
+                  union value *output, int width, const char *output_encoding);
 
 void data_in_imply_decimals (struct substring input, const char *encoding,
-                             enum fmt_type format, int d, union value *output);
+                             enum fmt_type format, int d,
+                             const struct fmt_settings *, union value *output);
 
 #endif /* data/data-in.h */