projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Consolidate multiple messages into single message dialog. Patch
[pspp-builds.git]
/
src
/
data
/
data-in.h
diff --git
a/src/data/data-in.h
b/src/data/data-in.h
index 779e8374fa466e9c724d56b912955074a20add22..52301c8cefe2a622092154ed5a7a09ef8b3ecd50 100644
(file)
--- a/
src/data/data-in.h
+++ b/
src/data/data-in.h
@@
-14,24
+14,20
@@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
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
+#if
ndef DATA_DATA_IN_H
+#define
DATA_DATA_IN_H
1
-#include <stddef.h>
#include <stdbool.h>
#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 <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,
+union value;
+bool data_in (struct substring input, enum legacy_encoding,
enum fmt_type, int implied_decimals, int first_column,
union value *output, int width);
enum fmt_type, int implied_decimals, int first_column,
union value *output, int width);
-#endif /* data-in.h */
+#endif /* data
/data
-in.h */