summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2003-06-18 08:15:14 +0000
committerJim Meyering <jim@meyering.net>2003-06-18 08:15:14 +0000
commit95857d75da1c530b49eec4aa9b6fdaf8877a2493 (patch)
treeffc26fead1865a10a03dbef494af43309084cd18 /lib
parente0418912fff0fe6d8c135ed4a4d0ae62f9045f94 (diff)
downloadcoreutils-95857d75da1c530b49eec4aa9b6fdaf8877a2493.tar.xz
Merge in change from gnulib.
Remove block of alloca-related code in favor of an unconditional `#include <alloca.h>'.
Diffstat (limited to 'lib')
-rw-r--r--lib/makepath.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/lib/makepath.c b/lib/makepath.c
index 823c1a81f..7455f9a76 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>