diff options
| author | Dan Nicolaescu | 2010-11-13 12:22:52 -0500 |
|---|---|---|
| committer | Chong Yidong | 2010-11-13 12:22:52 -0500 |
| commit | 4d613e98a7ca89dbebbcc1a2865f8df04bf888f8 (patch) | |
| tree | b5abd818b623806a41023f2c549c24b17ca343b9 /src | |
| parent | cdf015b1880d94bc414188ec5980171adc48bed2 (diff) | |
| download | emacs-4d613e98a7ca89dbebbcc1a2865f8df04bf888f8.tar.gz emacs-4d613e98a7ca89dbebbcc1a2865f8df04bf888f8.zip | |
Backport fix for Bug#6170 from trunk.
Fix alloca definition when using gcc on non-gnu systems.
* configure.in: Use the code sequence indicated by "info autoconf"
for alloca (bug#6170).
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.in | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/config.in b/src/config.in index 4667c0feb28..90098719511 100644 --- a/src/config.in +++ b/src/config.in | |||
| @@ -1178,15 +1178,19 @@ extern char *getenv (); | |||
| 1178 | #ifdef HAVE_STDLIB_H | 1178 | #ifdef HAVE_STDLIB_H |
| 1179 | #include <stdlib.h> | 1179 | #include <stdlib.h> |
| 1180 | #endif | 1180 | #endif |
| 1181 | #ifndef __GNUC__ | 1181 | #ifdef HAVE_ALLOCA_H |
| 1182 | # ifdef HAVE_ALLOCA_H | 1182 | # include <alloca.h> |
| 1183 | # include <alloca.h> | 1183 | #elif defined __GNUC__ |
| 1184 | # else /* AIX files deal with #pragma. */ | 1184 | # define alloca __builtin_alloca |
| 1185 | # ifndef alloca /* predefined by HP cc +Olibcalls */ | 1185 | #elif defined _AIX |
| 1186 | char *alloca (); | 1186 | # define alloca __alloca |
| 1187 | # endif | 1187 | #else |
| 1188 | # endif /* HAVE_ALLOCA_H */ | 1188 | # include <stddef.h> |
| 1189 | #endif /* __GNUC__ */ | 1189 | # ifdef __cplusplus |
| 1190 | extern "C" | ||
| 1191 | # endif | ||
| 1192 | void *alloca (size_t); | ||
| 1193 | #endif | ||
| 1190 | #ifndef HAVE_SIZE_T | 1194 | #ifndef HAVE_SIZE_T |
| 1191 | typedef unsigned size_t; | 1195 | typedef unsigned size_t; |
| 1192 | #endif | 1196 | #endif |