Fixed warnings generated by gcc 4.1.2

[pspp] / src / language / stats / correlations.q

diff --git a/src/language/stats/correlations.q b/src/language/stats/correlations.q
index 68d55635e36d92132822632d940a1c34f4125845..12d3645919d2eecf8600f0d25ce9358aae2a8f88 100644 (file)
--- a/src/language/stats/correlations.q
+++ b/src/language/stats/correlations.q
@@ -23,11 +23,12 @@
 
 #include <data/dictionary.h>
 #include <data/file-handle-def.h>
-#include <procedure.h>
+#include <data/procedure.h>
 #include <data/variable.h>
 #include <language/command.h>
 #include <language/data-io/file-handle.h>
 #include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
 #include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 
@@ -58,8 +59,8 @@ cmd_correlations (void)
 /* (specification)
    "CORRELATIONS" (cor_):
      *variables=custom;
-     +missing=miss:!pairwise/listwise,
-             inc:include/exclude;
+     missing=miss:!pairwise/listwise,
+            inc:include/exclude;
      +print=tail:!twotail/onetail,
            sig:!sig/nosig;
      +format=fmt:!matrix/serial;
@@ -77,7 +78,7 @@ internal_cmd_correlations (void)
   cor_list = cor_last = NULL;
   matrix_file = NULL;
 
-  if (!parse_correlations (&cmd))
+  if (!parse_correlations (&cmd, NULL))
     return CMD_FAILURE;
   free_correlations (&cmd);
 
@@ -85,7 +86,7 @@ internal_cmd_correlations (void)
 }
 
 static int
-cor_custom_variables (struct cmd_correlations *cmd UNUSED)
+cor_custom_variables (struct cmd_correlations *cmd UNUSED, void *aux UNUSED)
 {
   struct variable **v1, **v2;
   size_t nv1, nv2;
@@ -132,7 +133,7 @@ cor_custom_variables (struct cmd_correlations *cmd UNUSED)
 }
 
 static int
-cor_custom_matrix (struct cmd_correlations *cmd UNUSED)
+cor_custom_matrix (struct cmd_correlations *cmd UNUSED, void *aux UNUSED)
 {
   if (!lex_force_match ('('))
     return 0;