projects
/
platform
/
upstream
/
bash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported from ../bash-2.0.tar.gz.
[platform/upstream/bash.git]
/
memalloc.h
diff --git
a/memalloc.h
b/memalloc.h
index
92c0648
..
ba210bb
100644
(file)
--- a/
memalloc.h
+++ b/
memalloc.h
@@
-19,8
+19,8
@@
with Bash; see the file COPYING. If not, write to the Free Software
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
with Bash; see the file COPYING. If not, write to the Free Software
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-#if !defined (_
_MEMALLOC_H_
_)
-# define _
_MEMALLOC_H_
_
+#if !defined (_
MEMALLOC_H
_)
+# define _
MEMALLOC_H
_
#if defined (sparc) && defined (sun) && !defined (HAVE_ALLOCA_H)
# define HAVE_ALLOCA_H
#if defined (sparc) && defined (sun) && !defined (HAVE_ALLOCA_H)
# define HAVE_ALLOCA_H
@@
-34,8
+34,6
@@
# define HAVE_ALLOCA
#endif /* HAVE_ALLOCA_H && !HAVE_ALLOCA */
# define HAVE_ALLOCA
#endif /* HAVE_ALLOCA_H && !HAVE_ALLOCA */
-#if !defined (BUILDING_MAKEFILE)
-
#if defined (__GNUC__)
# undef alloca
# define alloca __builtin_alloca
#if defined (__GNUC__)
# undef alloca
# define alloca __builtin_alloca
@@
-46,15
+44,15
@@
# else /* !IBMESA */
# include <alloca.h>
# endif /* !IBMESA */
# else /* !IBMESA */
# include <alloca.h>
# endif /* !IBMESA */
-# else
-# if defined (hpux_9) && defined (__STDC__)
+# else
/* !HAVE_ALLOCA_H */
+# if defined (hpux_9) && defined (__STDC__)
&& !defined (alloca)
extern void *alloca ();
# else
extern void *alloca ();
# else
+# if !defined (alloca)
extern char *alloca ();
extern char *alloca ();
-# endif
+# endif /* !alloca */
+# endif /* !hpux_9 || !__STDC__ && !alloca */
# endif /* !HAVE_ALLOCA_H */
#endif /* !__GNUC__ */
# endif /* !HAVE_ALLOCA_H */
#endif /* !__GNUC__ */
-#endif /* !BUILDING_MAKEFILE */
-
-#endif /* __MEMALLOC_H__ */
+#endif /* _MEMALLOC_H_ */