Clean up pref.h.orig and deal with the consequences.

[pspp] / src / modify-vars.c

diff --git a/src/modify-vars.c b/src/modify-vars.c
index ac7d446dcd4e8b363b72041439f93569975fc5ac..bce6ea1bb337daef2736bba4de9c761f0ed4bbeb 100644 (file)
--- a/src/modify-vars.c
+++ b/src/modify-vars.c
@@ -17,24 +17,7 @@
    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 "algorithm.h"
@@ -377,7 +360,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_;