(static var write): Rename write_style to avoid

conflict with POSIX function of same name.

diff --git a/src/language/stats/ChangeLog b/src/language/stats/ChangeLog
index 29210345909c2feb06c87c20e7cce1b18c7ac783..641bca992f3f28f4866c6a8feb8dd48c7efe4b9c 100644 (file)
--- 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 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 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,