[Pspp-cvs] pspp/src/language/stats crosstabs.q ChangeLog

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/03/19 04:18:47

Modified files:
        src/language/stats: crosstabs.q ChangeLog 

Log message:
        (static var write): Rename write_style to avoid
        conflict with POSIX function of same name.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/crosstabs.q?cvsroot=pspp&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/ChangeLog?cvsroot=pspp&r1=1.46&r2=1.47

Patches:
Index: crosstabs.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/crosstabs.q,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- crosstabs.q 23 Dec 2006 06:11:33 -0000      1.27
+++ crosstabs.q 19 Mar 2007 04:18:47 -0000      1.28
@@ -167,7 +167,7 @@
 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 @@
          + 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,

Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/ChangeLog,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- ChangeLog   17 Mar 2007 03:08:23 -0000      1.46
+++ ChangeLog   19 Mar 2007 04:18:47 -0000      1.47
@@ -1,3 +1,8 @@
+2007-03-18  Ben Pfaff  <address@hidden>
+
+       * crosstabs.q (static var write): Rename write_style to avoid
+       conflict with POSIX function of same name.
+
 2007-03-16  Jason Stover  <address@hidden>
 
        * regression.q (run_regression): Added support for moments.