projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made var_is_valid_name more permissive.
[pspp]
/
src
/
data
/
data-in.h
diff --git
a/src/data/data-in.h
b/src/data/data-in.h
index 198128863bebec7e502d3e308600965905d50320..3a8d67cc22f66b28eb0bed54126e5a3255449064 100644
(file)
--- a/
src/data/data-in.h
+++ b/
src/data/data-in.h
@@
-14,25
+14,21
@@
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 <libpspp/legacy-encoding.h>
#include <libpspp/float-format.h>
#include <libpspp/integer-format.h>
#include <libpspp/str.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);
+#include <data/format.h>
+enum fmt_type;
+union value;
bool data_in (struct substring input, enum legacy_encoding,
bool data_in (struct substring input, enum legacy_encoding,
- enum fmt_type, int implied_decimals, int first_column,
+ enum fmt_type, int implied_decimals,
+ int first_column, int last_column,
union value *output, int width);
union value *output, int width);
-#endif /* data-in.h */
+#endif /* data
/data
-in.h */