projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Oops. Neglected to add new files.
[pspp-builds.git]
/
src
/
output
/
output.c
diff --git
a/src/output/output.c
b/src/output/output.c
index 8eccf763f9b9ea3b49f7192c9e4f547ac1161cce..843b0d4e544996cebcd736b25c8225e185337d1f 100644
(file)
--- a/
src/output/output.c
+++ b/
src/output/output.c
@@
-18,7
+18,9
@@
#include <ctype.h>
#include <errno.h>
#include <ctype.h>
#include <errno.h>
+#if HAVE_LC_PAPER
#include <langinfo.h>
#include <langinfo.h>
+#endif
#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
@@
-210,12
+212,12
@@
find_defn_value (const char *key)
return ds_cstr (&d->value);
if (!strcmp (key, "viewwidth"))
{
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"))
{
return buf;
}
else if (!strcmp (key, "viewlength"))
{
- sprintf (buf, "%d", get_viewlength ());
+ sprintf (buf, "%d",
settings_
get_viewlength ());
return buf;
}
else
return buf;
}
else
@@
-462,7
+464,7
@@
outp_done (void)
void
outp_list_classes (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"));
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");
if ((int) strlen (c->class->name) + 1 > width)
{
printf ("\n\t");
- width =
get_viewwidth
() - 8;
+ width =
settings_get_viewwidth
() - 8;
}
else
putc (' ', stdout);
}
else
putc (' ', stdout);