X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Foutput.c;h=843b0d4e544996cebcd736b25c8225e185337d1f;hb=5647b8fa947088764d27a5a76188c8d059e5c8af;hp=842e1c15c63bc383219c4a5de027883b2c086aff;hpb=873165af1d9ae450483816b892aa17afd669a7c0;p=pspp-builds.git

diff --git a/src/output/output.c b/src/output/output.c
index 842e1c15..843b0d4e 100644
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -18,14 +18,15 @@
 
 #include <ctype.h>
 #include <errno.h>
+#if HAVE_LC_PAPER
 #include <langinfo.h>
+#endif
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <data/file-name.h>
 #include <data/settings.h>
-#include <libpspp/alloc.h>
 #include <libpspp/misc.h>
 #include <libpspp/str.h>
 #include <output/htmlP.h>
@@ -33,6 +34,7 @@
 
 #include "error.h"
 #include "intprops.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -210,12 +212,12 @@ find_defn_value (const char *key)
       return ds_cstr (&d->value);
   if (!strcmp (key, "viewwidth"))
     {
-      sprintf (buf, "%d", get_viewwidth ());
+      sprintf (buf, "%d", settings_get_viewwidth ());
       return buf;
     }
   else if (!strcmp (key, "viewlength"))
     {
-      sprintf (buf, "%d", get_viewlength ());
+      sprintf (buf, "%d", settings_get_viewlength ());
       return buf;
     }
   else
@@ -462,7 +464,7 @@ outp_done (void)
 void
 outp_list_classes (void)
 {
-  int width = get_viewwidth();
+  int width = settings_get_viewwidth ();
   struct outp_driver_class_list *c;
 
   printf (_("Driver classes:\n\t"));
@@ -472,7 +474,7 @@ outp_list_classes (void)
       if ((int) strlen (c->class->name) + 1 > width)
 	{
 	  printf ("\n\t");
-	  width = get_viewwidth() - 8;
+	  width = settings_get_viewwidth () - 8;
 	}
       else
 	putc (' ', stdout);