From: John Darrington <john@darrington.wattle.id.au>
Date: Mon, 29 Nov 2004 04:26:59 +0000 (+0000)
Subject: Fixed conflict with stdio.h
X-Git-Tag: v0.4.0~219
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e78e2dcbb0afa6ec060ddd00ffe3231c1aac3907;p=pspp-builds.git

Fixed conflict with stdio.h
---

diff --git a/src/ChangeLog b/src/ChangeLog
index feddfc90..4de5e09b 100644
--- 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 833980c2..6859146f 100644
--- 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 1b1de91a..b904d80c 100644
--- 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 fcddb5f4..83c94931 100644
--- 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;