sys-file-reader: Omit @(#) from file strings in sfm_get_strings().

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

diff --git a/src/data/any-reader.c b/src/data/any-reader.c
index ff7f4ab6c923a4dd7bec8ea3e425e5523262b2bd..8ece73f62bb85ffc50941f8983e6bc4fd235f062 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)
 {
@@ -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);