From ca274c4e64fcf5281dd5be439ea0d235688f81ca Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@gnu.org>
Date: Mon, 19 Mar 2007 04:18:47 +0000
Subject: [PATCH] (static var write): Rename write_style to avoid conflict with
POSIX function of same name.
---
src/language/stats/ChangeLog | 5 +++++
src/language/stats/crosstabs.q | 8 ++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/language/stats/ChangeLog b/src/language/stats/ChangeLog
index 2921034590..641bca992f 100644
--- a/src/language/stats/ChangeLog
+++ b/src/language/stats/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-18 Ben Pfaff <blp@gnu.org>
+
+ * crosstabs.q (static var write): Rename write_style to avoid
+ conflict with POSIX function of same name.
+
2007-03-16 Jason Stover <jhs@math.gcsu.edu>
* regression.q (run_regression): Added support for moments.
diff --git a/src/language/stats/crosstabs.q b/src/language/stats/crosstabs.q
index 775e415a53..4d8a2b7bdd 100644
--- 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 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;
@@ -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])
- write = CRS_WR_CELLS;
+ write_style = CRS_WR_CELLS;
else if (cmd.a_write[CRS_WR_ALL])
- write = CRS_WR_ALL;
+ write_style = CRS_WR_ALL;
else
- write = CRS_WR_NONE;
+ write_style = CRS_WR_NONE;
ok = procedure_with_splits (ds, precalc,
mode == GENERAL ? calc_general : calc_integer,
--
2.30.2