projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make psppire-axis thread safer
[pspp]
/
src
/
output
/
ascii.c
diff --git
a/src/output/ascii.c
b/src/output/ascii.c
index f2dff490b8bb23bb92741ad68b280ed740458217..29d7b76b2940d76dbc0af108827922785f8e71ce 100644
(file)
--- a/
src/output/ascii.c
+++ b/
src/output/ascii.c
@@
-24,7
+24,6
@@
#include <data/file-name.h>
#include <data/settings.h>
#include <data/file-name.h>
#include <data/settings.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/pool.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/pool.h>
@@
-35,6
+34,7
@@
#include "error.h"
#include "minmax.h"
#include "output.h"
#include "error.h"
#include "minmax.h"
#include "output.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-238,9
+238,9
@@
update_page_size (struct outp_driver *this, bool issue_error)
int margins = x->top_margin + x->bottom_margin + 1 + (x->headers ? 3 : 0);
if (x->auto_width)
int margins = x->top_margin + x->bottom_margin + 1 + (x->headers ? 3 : 0);
if (x->auto_width)
- this->width = get_viewwidth ();
+ this->width =
settings_
get_viewwidth ();
if (x->auto_length)
if (x->auto_length)
- x->page_length = get_viewlength ();
+ x->page_length =
settings_
get_viewlength ();
this->length = x->page_length - margins;
this->length = x->page_length - margins;