Merge two option structs

[pspp] / src / data / ods-reader.h

diff --git a/src/data/ods-reader.h b/src/data/ods-reader.h
index 79b7169833957564382dcb56e9ff043d00b80523..1a5525d8f669f658315b597a08780617f74718ac 100644 (file)
--- a/src/data/ods-reader.h
+++ b/src/data/ods-reader.h
@@ -20,8 +20,13 @@
 struct casereader;
 struct dictionary;
 struct spreadsheet_read_info;
+struct spreadsheet_read_options;
 
-struct casereader * ods_open_reader (struct spreadsheet_read_info *, struct dictionary **);
+
+struct spreadsheet *ods_probe (const char *filename, bool report_errors);
+
+struct casereader * ods_make_reader (struct spreadsheet *spreadsheet, 
+                                    const struct spreadsheet_read_options *opts);
 
 
 #endif