projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(static var write): Rename write_style to avoid
[pspp-builds.git]
/
src
/
language
/
stats
/
crosstabs.q
diff --git
a/src/language/stats/crosstabs.q
b/src/language/stats/crosstabs.q
index 775e415a53faaa71d8e96534ceb4cd8e7b9948d7..4d8a2b7bdd6fdfb29d3cd8622cf64a8943f17929 100644
(file)
--- a/
src/language/stats/crosstabs.q
+++ b/
src/language/stats/crosstabs.q
@@
-167,7
+167,7
@@
static int num_cells; /* Number of cells requested. */
static int cells[8]; /* Cells requested. */
/* WRITE. */
static int cells[8]; /* Cells requested. */
/* WRITE. */
-static int write
;
/* One of WR_* that specifies the WRITE style. */
+static int write
_style;
/* One of WR_* that specifies the WRITE style. */
/* Command parsing info. */
static struct cmd_crosstabs cmd;
/* Command parsing info. */
static struct cmd_crosstabs cmd;
@@
-288,11
+288,11
@@
internal_cmd_crosstabs (struct lexer *lexer, struct dataset *ds)
+ cmd.a_write[CRS_WR_CELLS] == 0))
cmd.a_write[CRS_WR_CELLS] = 1;
if (cmd.a_write[CRS_WR_CELLS])
+ cmd.a_write[CRS_WR_CELLS] == 0))
cmd.a_write[CRS_WR_CELLS] = 1;
if (cmd.a_write[CRS_WR_CELLS])
- write = CRS_WR_CELLS;
+ write
_style
= CRS_WR_CELLS;
else if (cmd.a_write[CRS_WR_ALL])
else if (cmd.a_write[CRS_WR_ALL])
- write = CRS_WR_ALL;
+ write
_style
= CRS_WR_ALL;
else
else
- write = CRS_WR_NONE;
+ write
_style
= CRS_WR_NONE;
ok = procedure_with_splits (ds, precalc,
mode == GENERAL ? calc_general : calc_integer,
ok = procedure_with_splits (ds, precalc,
mode == GENERAL ? calc_general : calc_integer,