From: Jim Meyering <jim@meyering.net>
Date: Wed, 18 Jun 2003 08:15:14 +0000 (+0000)
Subject: Merge in change from gnulib.
X-Git-Tag: v5.0.1~202
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95857d75da1c530b49eec4aa9b6fdaf8877a2493;p=thirdparty%2Fcoreutils.git

Merge in change from gnulib.

Remove block of alloca-related code in favor
of an unconditional `#include <alloca.h>'.
---

diff --git a/lib/makepath.c b/lib/makepath.c
index 823c1a81fe..7455f9a760 100644
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -1,6 +1,7 @@
 /* makepath.c -- Ensure that a directory path exists.
-   Copyright (C) 1990, 1997, 1998, 1999, 2000, 2002, 2003 Free Software
-   Foundation, Inc.
+
+   Copyright (C) 1990, 1997, 1998, 1999, 2000, 2002, 2003 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,19 +23,7 @@
 # include <config.h>
 #endif
 
-#if __GNUC__
-# define alloca __builtin_alloca
-#else
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #  pragma alloca
-#  else
-char *alloca ();
-#  endif
-# endif
-#endif
+#include <alloca.h>
 
 #include <stdio.h>
 #include <sys/types.h>