summaryrefslogtreecommitdiff
path: root/src/m
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1995-06-18 13:24:32 +0000
committerRichard M. Stallman <rms@gnu.org>1995-06-18 13:24:32 +0000
commit768693843735994c4bd2ab1fa954c185e2cdcc2e (patch)
tree39d1a6aeadc7c8ac1d6066ba455ed4401b7f2004 /src/m
parent365636dc53147e9a3192f3a19f0b2f176fa1db56 (diff)
downloademacs-768693843735994c4bd2ab1fa954c185e2cdcc2e.tar.gz
(malloc, realloc): If not _MALLOC_INTERNAL, always use void *.
(SYSTEM_MALLOC): Definition deleted.
Diffstat (limited to 'src/m')
-rw-r--r--src/m/alpha.h7
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
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 ();