X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmatrix-data.c;h=e0dfdcee4c2d036a5179926a0b5124aa9c59dee2;hb=64f58bbdab17e4a09b725e713f4f82f567f44076;hp=776dfa5b1c5908bfe21d8fd21583e83f23d01039;hpb=317e6b778833b5dcd5dd195c0b677835a8024b2a;p=pspp-builds.git

diff --git a/src/matrix-data.c b/src/matrix-data.c
index 776dfa5b..e0dfdcee 100644
--- a/src/matrix-data.c
+++ b/src/matrix-data.c
@@ -38,6 +38,9 @@
 #include "var.h"
 #include "vfm.h"
 
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 #include "debug-print.h"
 
 /* FIXME: /N subcommand not implemented.  It should be pretty simple,
@@ -568,7 +571,7 @@ cmd_matrix_data (void)
      system file output. */
   {
     struct variable **v;
-    size_t nv;
+    int nv;
 
     dict_get_vars (default_dict, &v, &nv, 0);
     qsort (v, nv, sizeof *v, compare_variables_by_mxd_var_type);
@@ -884,9 +887,7 @@ static int
 	  di.e = token->string + token->length;
 	  di.v = (union value *) &token->number;
 	  di.f1 = first_column;
-	  di.format.type = FMT_F;
-	  di.format.w = token->length;
-	  di.format.d = 0;
+	  di.format = make_output_format (FMT_F, token->length, 0);
 
 	  if (!data_in (&di))
 	    return 0;