X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Flist.q;h=8e8bba9b69a281ae707cd021d2bd777e0176bf6f;hb=92f9121c49de9f91d9d743b5dc854cf701713dc5;hp=0227c72b1ebb414c4b9f51c19364923a4fad0436;hpb=7a887989fb1da56ebd264ee3338c1472c7e40a51;p=pspp-builds.git

diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q
index 0227c72b..8e8bba9b 100644
--- a/src/language/data-io/list.q
+++ b/src/language/data-io/list.q
@@ -16,11 +16,11 @@
 
 #include <config.h>
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "intprops.h"
-#include "size_max.h"
 #include "xmalloca.h"
 
 #include <data/casegrouper.h>
@@ -29,11 +29,11 @@
 #include <data/data-out.h>
 #include <data/format.h>
 #include <data/procedure.h>
+#include <data/short-names.h>
 #include <data/variable.h>
 #include <language/command.h>
 #include <language/dictionary/split-file.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
 #include <libpspp/message.h>
@@ -44,6 +44,7 @@
 #include <output/table.h>
 
 #include "minmax.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -150,7 +151,7 @@ cmd_list (struct lexer *lexer, struct dataset *ds)
     cmd.last = LONG_MAX;
   if (!cmd.sbc_variables)
     dict_get_vars (dict, &cmd.v_variables, &cmd.n_variables,
-		   (1u << DC_SYSTEM) | (1u << DC_SCRATCH));
+                   DC_SYSTEM | DC_SCRATCH);
   if (cmd.n_variables == 0)
     {
       msg (SE, _("No variables specified."));
@@ -507,7 +508,7 @@ write_fallback_headers (struct outp_driver *d)
 	  }
 
 	  {
-	    char varname[LONG_NAME_LEN + 2];
+	    char varname[VAR_NAME_LEN + 2];
 	    snprintf (varname, sizeof varname,
                       " %s", var_get_name (cmd.v_variables[index]));
 	    write_varname (d, varname, leader_width);