treewide: Replace <name>_cnt by n_<name>s and <name>_cap by allocated_<name>.

[pspp] / src / data / any-reader.c

diff --git a/src/data/any-reader.c b/src/data/any-reader.c
index a77fa2793f59e8dc028d1367d5781093afca3d50..5a20ccef8360d6cd7f6c225afc5b3feb7a972330 100644 (file)
--- a/src/data/any-reader.c
+++ b/src/data/any-reader.c
@@ -129,6 +129,10 @@ any_reader_open (struct file_handle *handle)
   NOT_REACHED ();
 }
 
+/* gnulib on some systems defines "close" as something else,
+   which causes problems for this code.  So undefine it here.  */
+#undef close
+
 bool
 any_reader_close (struct any_reader *any_reader)
 {
@@ -244,7 +248,7 @@ dataset_reader_decode (struct any_reader *r_, const char *encoding UNUSED,
       info->integer_format = INTEGER_NATIVE;
       info->float_format = FLOAT_NATIVE_DOUBLE;
       info->compression = ANY_COMP_NONE;
-      info->case_cnt = casereader_get_case_cnt (reader);
+      info->n_cases = casereader_get_n_cases (reader);
     }
   free (r);