X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmodify-vars.c;h=5cddfe15a349e3640e0a17e26d5a32de84871148;hb=3bd4593ef9a57f23062c61ec465389f749ba3089;hp=ac7d446dcd4e8b363b72041439f93569975fc5ac;hpb=3a7fba81ceae5b049d0f7d671e9e3c3c43bbf703;p=pspp-builds.git

diff --git a/src/modify-vars.c b/src/modify-vars.c
index ac7d446d..5cddfe15 100644
--- a/src/modify-vars.c
+++ b/src/modify-vars.c
@@ -17,30 +17,14 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA. */
 
-/* AIX requires this to be the first thing in the file.  */
 #include <config.h>
-#if __GNUC__
-#define alloca __builtin_alloca
-#else
-#if HAVE_ALLOCA_H
-#include <alloca.h>
-#else
-#ifdef _AIX
-#pragma alloca
-#else
-#ifndef alloca			/* predefined by HP cc +Olibcalls */
-char *alloca ();
-#endif
-#endif
-#endif
-#endif
-
 #include <stdlib.h>
-#include <assert.h>
+#include "error.h"
 #include "algorithm.h"
 #include "alloc.h"
 #include "bitvector.h"
 #include "command.h"
+#include "dictionary.h"
 #include "error.h"
 #include "hash.h"
 #include "lexer.h"
@@ -100,8 +84,12 @@ cmd_modify_vars (void)
 
   size_t i;
 
-  lex_match_id ("MODIFY");
-  lex_match_id ("VARS");
+  if (temporary != 0)
+    {
+      msg (SE, _("MODIFY VARS may not be used after TEMPORARY.  "
+                 "Temporary transformations will be made permanent."));
+      cancel_temporary (); 
+    }
 
   vm.reorder_vars = NULL;
   vm.reorder_cnt = 0;
@@ -326,7 +314,7 @@ cmd_modify_vars (void)
   if (already_encountered & (1 | 4))
     {
       /* Read the data. */
-      procedure (NULL, NULL, NULL);
+      procedure (NULL, NULL);
     }
 
   if (!rearrange_dict (default_dict, &vm))
@@ -377,7 +365,7 @@ struct var_renaming
    var_renaming structures A and B. */
 static int
 compare_var_renaming_by_new_name (const void *a_, const void *b_,
-                                  void *foo unused) 
+                                  void *foo UNUSED) 
 {
   const struct var_renaming *a = a_;
   const struct var_renaming *b = b_;