X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fany-reader.c;h=5a20ccef8360d6cd7f6c225afc5b3feb7a972330;hb=604b7adbf9c26922f7a20887b2baf16a3f0acef6;hp=ff7f4ab6c923a4dd7bec8ea3e425e5523262b2bd;hpb=d6cbbc8d634fa91f050661355139a4e4697e99ab;p=pspp

diff --git a/src/data/any-reader.c b/src/data/any-reader.c
index ff7f4ab6c9..5a20ccef83 100644
--- 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)
 {
@@ -222,7 +226,7 @@ static bool
 dataset_reader_close (struct any_reader *r_)
 {
   struct dataset_reader *r = dataset_reader_cast (r_);
-  dict_destroy (r->dict);
+  dict_unref (r->dict);
   casereader_destroy (r->reader);
   free (r);
 
@@ -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);