projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Break macro structure definition into new file.
[pspp]
/
src
/
output
/
ascii.c
diff --git
a/src/output/ascii.c
b/src/output/ascii.c
index ee87fa22e37c3341071239ef1e3c90899ef6036d..f0be586dbd9277b69cee4af01471d2906c57c3ef 100644
(file)
--- a/
src/output/ascii.c
+++ b/
src/output/ascii.c
@@
-28,11
+28,8
@@
#include <uniwidth.h>
#ifdef HAVE_TERMIOS_H
#include <uniwidth.h>
#ifdef HAVE_TERMIOS_H
-# include <termios.h>
-#endif
-
-#ifdef GWINSZ_IN_SYS_IOCTL
# include <sys/ioctl.h>
# include <sys/ioctl.h>
+# include <termios.h>
#endif
#include "data/file-name.h"
#endif
#include "data/file-name.h"
@@
-648,7
+645,7
@@
ascii_submit (struct output_driver *driver, const struct output_item *item)
break;
case OUTPUT_ITEM_GROUP:
break;
case OUTPUT_ITEM_GROUP:
-
NOT_REACHED ()
;
+
break
;
case OUTPUT_ITEM_PAGE_BREAK:
break;
case OUTPUT_ITEM_PAGE_BREAK:
break;
@@
-1036,8
+1033,8
@@
ascii_test_write (struct output_driver *driver,
.underline = underline,
};
const struct pivot_value value = {
.underline = underline,
};
const struct pivot_value value = {
- .type = PIVOT_VALUE_TEXT,
.text = {
.text = {
+ .type = PIVOT_VALUE_TEXT,
.local = CONST_CAST (char *, s),
.c = CONST_CAST (char *, s),
.id = CONST_CAST (char *, s),
.local = CONST_CAST (char *, s),
.c = CONST_CAST (char *, s),
.id = CONST_CAST (char *, s),