summaryrefslogtreecommitdiff
path: root/src/m/alpha.h
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1995-06-15 13:57:17 +0000
committerRichard M. Stallman <rms@gnu.org>1995-06-15 13:57:17 +0000
commitbb8152dea9dbcd7cf76d912fd397a26e75fa84fb (patch)
tree1cf30f38acc0751ebfaa652aa79f3dbdedafe3f3 /src/m/alpha.h
parent4f3f0be401102c31d50c84e77159e0535bad4b62 (diff)
downloademacs-bb8152dea9dbcd7cf76d912fd397a26e75fa84fb.tar.gz
(LD_SWITCH_MACHINE): Don't define it.
(malloc, realloc): If non-ANSI C, declare value as char *.
Diffstat (limited to 'src/m/alpha.h')
-rw-r--r--src/m/alpha.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/m/alpha.h b/src/m/alpha.h
index 0b4db8bb6fc..0358ab65fa8 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -169,12 +169,15 @@ NOTE-END
#define LIBS_MACHINE -ldnet_stub
#endif
+#if 0 /* Rainer Schoepf <schoepf@uni-mainz.de> says this loses with X11R6
+ since it has only shared libraries. */
#ifndef __GNUC__
/* This apparently is for the system ld as opposed to Gnu ld. */
#ifdef OSF1
#define LD_SWITCH_MACHINE -non_shared
#endif
#endif
+#endif /* 0 */
#define LIBS_DEBUG
#define START_FILES pre-crt0.o
@@ -230,7 +233,12 @@ 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. */
+/* 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
extern long *xmalloc (), *xrealloc ();