diff options
| author | Richard M. Stallman | 1995-06-18 13:24:32 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-06-18 13:24:32 +0000 |
| commit | 768693843735994c4bd2ab1fa954c185e2cdcc2e (patch) | |
| tree | 39d1a6aeadc7c8ac1d6066ba455ed4401b7f2004 /src | |
| parent | 365636dc53147e9a3192f3a19f0b2f176fa1db56 (diff) | |
| download | emacs-768693843735994c4bd2ab1fa954c185e2cdcc2e.tar.gz emacs-768693843735994c4bd2ab1fa954c185e2cdcc2e.zip | |
(malloc, realloc): If not _MALLOC_INTERNAL, always use void *.
(SYSTEM_MALLOC): Definition deleted.
Diffstat (limited to 'src')
| -rw-r--r-- | src/m/alpha.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/m/alpha.h b/src/m/alpha.h index 0358ab65fa8..5ee92e43ad1 100644 --- a/src/m/alpha.h +++ b/src/m/alpha.h | |||
| @@ -121,7 +121,7 @@ NOTE-END | |||
| 121 | mallocs work with "alpha-dec-osf2.0", but I daren't break anything | 121 | mallocs work with "alpha-dec-osf2.0", but I daren't break anything |
| 122 | right now. Feel free to play if you want. */ | 122 | right now. Feel free to play if you want. */ |
| 123 | 123 | ||
| 124 | #define SYSTEM_MALLOC | 124 | /* #define SYSTEM_MALLOC */ |
| 125 | 125 | ||
| 126 | /* Define NO_REMAP if memory segmentation makes it not work well | 126 | /* Define NO_REMAP if memory segmentation makes it not work well |
| 127 | to change the boundary between the text section and data section | 127 | to change the boundary between the text section and data section |
| @@ -233,12 +233,17 @@ NOTE-END | |||
| 233 | 233 | ||
| 234 | /* We need to prototype these for the lib-src programs even if we don't | 234 | /* We need to prototype these for the lib-src programs even if we don't |
| 235 | use the system malloc for the Emacs proper. */ | 235 | use the system malloc for the Emacs proper. */ |
| 236 | #ifdef _MALLOC_INTERNAL | ||
| 236 | /* These declarations are designed to match the ones in gmalloc.c. */ | 237 | /* These declarations are designed to match the ones in gmalloc.c. */ |
| 237 | #if defined (__STDC__) && __STDC__ | 238 | #if defined (__STDC__) && __STDC__ |
| 238 | extern void *malloc (), *realloc (); | 239 | extern void *malloc (), *realloc (); |
| 239 | #else | 240 | #else |
| 240 | extern char *malloc (), *realloc (); | 241 | extern char *malloc (), *realloc (); |
| 241 | #endif | 242 | #endif |
| 243 | #else /* not _MALLOC_INTERNAL */ | ||
| 244 | extern void *malloc (), *realloc (); | ||
| 245 | #endif /* not _MALLOC_INTERNAL */ | ||
| 246 | |||
| 242 | 247 | ||
| 243 | extern long *xmalloc (), *xrealloc (); | 248 | extern long *xmalloc (), *xrealloc (); |
| 244 | 249 | ||