Fixed conflict with stdio.h

diff --git a/src/ChangeLog b/src/ChangeLog
index feddfc900f564c56d9d4f1ed198a90d1322c17ba..4de5e09bd23c20d85e2b074318aa09fa67684492 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 29 12:20:59 WST 2004 John Darrington <john@darrington.wattle.id.au>
+
+       * examine.q factor_stats.[ch] Changed stderr to se_mean to avoid
+       conflict with stdio.
+
 Sun Nov 21 10:32:41 WST 2004 John Darrington <john@darrington.wattle.id.au>
 
        * var-labs.c (var_to_string) Now returns null if the variable is null

diff --git a/src/examine.q b/src/examine.q
index 833980c2e48b93da350bdd1fa02e4653dd7736cb..6859146f5d25b246782060da9d4a7700461a982f 100644 (file)
--- a/src/examine.q
+++ b/src/examine.q
@@ -1289,7 +1289,7 @@ populate_descriptives(struct tab_table *tbl, int col, int row,
   tab_float (tbl, col + 3,
             row,
             TAB_CENTER,
-            m->stderr,
+            m->se_mean,
             8,3);
   
 
@@ -1307,7 +1307,7 @@ populate_descriptives(struct tab_table *tbl, int col, int row,
   tab_float (tbl, col + 2,
             row + 1,
             TAB_CENTER,
-            m->mean - t * m->stderr, 
+            m->mean - t * m->se_mean, 
             8,3);
 
   tab_text (tbl, col + 1,  
@@ -1319,7 +1319,7 @@ populate_descriptives(struct tab_table *tbl, int col, int row,
   tab_float (tbl, col + 2,
             row + 2,
             TAB_CENTER,
-            m->mean + t * m->stderr, 
+            m->mean + t * m->se_mean, 
             8,3);
 
   tab_text (tbl, col, 

diff --git a/src/factor_stats.c b/src/factor_stats.c
index 1b1de91adb4c4dab8e6ffa8d2cb7e9957af0d9a9..b904d80cc59531c58f1df580b72ee3b654034667 100644 (file)
--- a/src/factor_stats.c
+++ b/src/factor_stats.c
@@ -135,7 +135,7 @@ metrics_postcalc(struct metrics *m)
 
   /* FIXME: Check this is correct ???
      Shouldn't we use the sample variance ??? */
-  m->stderr = sqrt (m->var / m->n) ;
+  m->se_mean = sqrt (m->var / m->n) ;
 
 
 

diff --git a/src/factor_stats.h b/src/factor_stats.h
index fcddb5f4720b6c64563f5db815a9a335c3192c81..83c9493155398cb9943f8018041031a0c98231ad 100644 (file)
--- a/src/factor_stats.h
+++ b/src/factor_stats.h
@@ -43,7 +43,7 @@ struct metrics
 
   double mean;
   
-  double stderr;
+  double se_mean;
 
   double var;