From: Richard M. Stallman Date: Sun, 18 Jun 1995 13:24:32 +0000 (+0000) Subject: (malloc, realloc): If not _MALLOC_INTERNAL, always use void *. X-Git-Tag: emacs-19.34~3558 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=768693843735994c4bd2ab1fa954c185e2cdcc2e;p=emacs.git (malloc, realloc): If not _MALLOC_INTERNAL, always use void *. (SYSTEM_MALLOC): Definition deleted. --- 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 mallocs work with "alpha-dec-osf2.0", but I daren't break anything right now. Feel free to play if you want. */ -#define SYSTEM_MALLOC +/* #define SYSTEM_MALLOC */ /* Define NO_REMAP if memory segmentation makes it not work well to change the boundary between the text section and data section @@ -233,12 +233,17 @@ NOTE-END /* We need to prototype these for the lib-src programs even if we don't use the system malloc for the Emacs proper. */ +#ifdef _MALLOC_INTERNAL /* These declarations are designed to match the ones in gmalloc.c. */ #if defined (__STDC__) && __STDC__ extern void *malloc (), *realloc (); #else extern char *malloc (), *realloc (); #endif +#else /* not _MALLOC_INTERNAL */ +extern void *malloc (), *realloc (); +#endif /* not _MALLOC_INTERNAL */ + extern long *xmalloc (), *xrealloc ();