Use pow2 function instead of SQR macro.

Thanks to Ben Pfaff for this suggestion.

diff --git a/src/language/stats/reliability.q b/src/language/stats/reliability.q
index edacdf12a1a5aea5fb615b91d07cfc0f80fb39cd..0222a3f33dfd41b54649d68dd1a5f4adb6cd67de 100644 (file)
--- a/src/language/stats/reliability.q
+++ b/src/language/stats/reliability.q
@@ -640,10 +640,10 @@ reliability_statistics_model_split (struct tab_table *tbl,
     tab_float (tbl, 3, 8, TAB_RIGHT, g, 8, 3);
 
     tmp = (1.0 - r*r) * rel->sc[1].n_items * rel->sc[2].n_items /
-      SQR (rel->sc[0].n_items);
+      pow2 (rel->sc[0].n_items);
 
-    uly = sqrt( SQR (SQR (r)) + 4 * SQR (r) * tmp);
-    uly -= SQR (r);
+    uly = sqrt( pow4 (r) + 4 * pow2 (r) * tmp);
+    uly -= pow2 (r);
     uly /= 2 * tmp;
 
     tab_float (tbl, 3, 7, TAB_RIGHT, uly, 8, 3);

diff --git a/src/libpspp/misc.h b/src/libpspp/misc.h
index f3afb1fb91a88b8d91fd7835a1ab754d95fa06c4..3b02515709ca9969c8d67eab5c9c2210e4822d1e 100644 (file)
--- a/src/libpspp/misc.h
+++ b/src/libpspp/misc.h
@@ -35,8 +35,6 @@
 /* Rounds X down to the previous multiple of Y. */
 #define ROUND_DOWN(X, Y) ((X) / (Y) * (Y))
 
-#define SQR(X) ((X) * (X))
-
 int intlog10 (unsigned);
 
 /* Returns the square of X. */