From: John Darrington <john@darrington.wattle.id.au>
Date: Mon, 1 Apr 2013 05:51:32 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into import-gui
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb0c5ca97866cea44dd5467bd630577e19f27707;p=pspp

Merge remote branch 'origin/master' into import-gui

Conflicts:
	src/data/casereader.c
---

cb0c5ca97866cea44dd5467bd630577e19f27707
diff --cc src/data/casereader.c
index 37adbb37d6,adb6b6a909..423a4dada2
--- a/src/data/casereader.c
+++ b/src/data/casereader.c
@@@ -244,7 -254,11 +254,10 @@@ casereader_count_cases__ (const struct 
  #if (__GNUC__ == 4 ) && (__GNUC_MINOR__ == 4)
    volatile int x = 1; x++;
  #endif
+ 
+   clone = casereader_clone (reader);
+   n_cases = casereader_advance (clone, max_cases);
    casereader_destroy (clone);
 -
    return n_cases;
  }