From 6bc566408707e018674d1776d835c78368b6b5a3 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 31 Dec 2003 06:46:22 +0000 Subject: [PATCH] Tue Dec 30 22:42:57 2003 Ben Pfaff * Removed bletcherous alloca() workarounds for AIX from top of many files. AIX can use the alternative alloca() implementation instead. --- src/ChangeLog | 6 ++++++ src/cases.c | 17 ----------------- src/command.c | 17 ----------------- src/crosstabs.q | 17 ----------------- src/data-list.c | 17 ----------------- src/dfm.c | 17 ----------------- src/error.c | 17 ----------------- src/expr-evl.c | 16 ---------------- src/filename.c | 17 ----------------- src/list.q | 17 ----------------- src/matrix-data.c | 17 ----------------- src/modify-vars.c | 17 ----------------- src/pfm-read.c | 17 ----------------- src/postscript.c | 16 ---------------- src/print.c | 17 ----------------- src/sfm-read.c | 17 ----------------- src/sfm-write.c | 17 ----------------- src/tab.c | 17 ----------------- src/vars-prs.c | 17 ----------------- src/vfm.c | 17 ----------------- 20 files changed, 6 insertions(+), 321 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index e1e6ad58..4e205f8c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +Tue Dec 30 22:42:57 2003 Ben Pfaff + + * Removed bletcherous alloca() workarounds for AIX from top of + many files. AIX can use the alternative alloca() implementation + instead. + Tue Dec 30 22:35:16 2003 Ben Pfaff * ascii.c: (ascii_option) Fix implementation of headers option. diff --git a/src/cases.c b/src/cases.c index ba0921dd..6ca177c2 100644 --- a/src/cases.c +++ b/src/cases.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 -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - #include #include #include diff --git a/src/command.c b/src/command.c index 4afe70be..7e9bb774 100644 --- a/src/command.c +++ b/src/command.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 -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - #include #include "command.h" #include diff --git a/src/crosstabs.q b/src/crosstabs.q index bf89d377..4bd5e68d 100644 --- a/src/crosstabs.q +++ b/src/crosstabs.q @@ -29,24 +29,7 @@ */ -/* AIX requires this to be the first thing in the file. */ #include -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - #include #include #include diff --git a/src/data-list.c b/src/data-list.c index a024b263..b2d12893 100644 --- a/src/data-list.c +++ b/src/data-list.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 -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - #include #include #include diff --git a/src/dfm.c b/src/dfm.c index 0cfa801f..b5023a82 100644 --- a/src/dfm.c +++ b/src/dfm.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 -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - #include #include "dfm.h" #include diff --git a/src/error.c b/src/error.c index fc34d5d9..9896fb27 100644 --- a/src/error.c +++ b/src/error.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 -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - #include #include "error.h" #include diff --git a/src/expr-evl.c b/src/expr-evl.c index b8991547..100571c6 100644 --- a/src/expr-evl.c +++ b/src/expr-evl.c @@ -17,23 +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 -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif #if TIME_WITH_SYS_TIME #include diff --git a/src/filename.c b/src/filename.c index 458b1c41..4d90e6d5 100644 --- a/src/filename.c +++ b/src/filename.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 -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - #include #include "filename.h" #include diff --git a/src/list.q b/src/list.q index 824e51da..dbdacb57 100644 --- a/src/list.q +++ b/src/list.q @@ -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 -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - #include #include #include diff --git a/src/matrix-data.c b/src/matrix-data.c index c462b7cf..892e716f 100644 --- a/src/matrix-data.c +++ b/src/matrix-data.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 -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - #include #include #include diff --git a/src/modify-vars.c b/src/modify-vars.c index ac7d446d..ed28ee4c 100644 --- 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 -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - #include #include #include "algorithm.h" diff --git a/src/pfm-read.c b/src/pfm-read.c index 99a7931a..7d80de3f 100644 --- a/src/pfm-read.c +++ b/src/pfm-read.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 -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - #include "pfm.h" #include #include diff --git a/src/postscript.c b/src/postscript.c index ef6cebe9..be8abb5a 100644 --- a/src/postscript.c +++ b/src/postscript.c @@ -17,23 +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 -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif /*this #if encloses the remainder of the file. */ #if !NO_POSTSCRIPT diff --git a/src/print.c b/src/print.c index b0ef286d..e1f7f6ef 100644 --- a/src/print.c +++ b/src/print.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 -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - #include #include #include "alloc.h" diff --git a/src/sfm-read.c b/src/sfm-read.c index b8ba86d4..bbf5762c 100644 --- a/src/sfm-read.c +++ b/src/sfm-read.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 -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - #include "sfm.h" #include "sfmP.h" #include diff --git a/src/sfm-write.c b/src/sfm-write.c index 97028a49..67cdf231 100644 --- a/src/sfm-write.c +++ b/src/sfm-write.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 -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - #include "sfm.h" #include "sfmP.h" #include diff --git a/src/tab.c b/src/tab.c index 7e81b6cc..acfe3525 100644 --- a/src/tab.c +++ b/src/tab.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 -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - #include "tab.h" #include #include diff --git a/src/vars-prs.c b/src/vars-prs.c index d5001b2d..2377d538 100644 --- a/src/vars-prs.c +++ b/src/vars-prs.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 -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - #include "var.h" #include #include diff --git a/src/vfm.c b/src/vfm.c index 17bd9f26..84efc3e0 100644 --- a/src/vfm.c +++ b/src/vfm.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 -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - #include "vfm.h" #include "vfmP.h" #include -- 2.30.2