X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Ffrequencies.q;h=0ca83a45b29e95f866aaedc8d521c81b234ced19;hb=93abfcc57a1e6ff792e5ae01784172459eee783f;hp=50b11f37d00d22768f3825d0e166bfa59006f602;hpb=2c4c4a789e9c23478bce195d2ed98bab6064dfc1;p=pspp-builds.git

diff --git a/src/frequencies.q b/src/frequencies.q
index 50b11f37..0ca83a45 100644
--- a/src/frequencies.q
+++ b/src/frequencies.q
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 /*
   TODO:
@@ -51,6 +51,11 @@
 #include "vfm.h"
 #include "settings.h"
 #include "chart.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
 /* (headers) */
 
 #include "debug-print.h"
@@ -692,7 +697,7 @@ not_missing (const void *f_, void *v_)
   const struct freq *f = f_;
   struct variable *v = v_;
 
-  return !is_missing (&f->v, v);
+  return !mv_is_value_missing (&v->miss, &f->v);
 }
 
 /* Summarizes the frequency table data for variable V. */
@@ -702,7 +707,7 @@ postprocess_freq_tab (struct variable *v)
   hsh_compare_func *compare;
   struct freq_tab *ft;
   size_t count;
-  void **data;
+  void *const *data;
   struct freq *freqs, *f;
   size_t i;
 
@@ -868,7 +873,7 @@ frq_custom_grouped (struct cmd_frequencies *cmd UNUSED)
 	  {
 	    nl = ml = 0;
 	    dl = NULL;
-	    while (token == T_NUM)
+	    while (lex_integer ())
 	      {
 		if (nl >= ml)
 		  {
@@ -1559,7 +1564,7 @@ freq_tab_to_hist(const struct freq_tab *ft, const struct variable *var)
   /* Find out the extremes of the x value */
   for ( frq = hsh_first(fh, &hi); frq != 0; frq = hsh_next(fh, &hi) ) 
     {
-      if ( is_missing(&frq->v, var))
+      if ( mv_is_value_missing(&var->miss, &frq->v))
 	continue;
 
       if ( frq->v.f < x_min ) x_min = frq->v.f ;