# HG changeset patch # User Richard M. Stallman # Date 803224637 0 # Node ID 6d2e893b7ff7d062c4b8e4319e9a33d7b8038c34 # Parent 2de6f5e4858da7f606ccdc0cef5ba7783da14b17 (LD_SWITCH_MACHINE): Don't define it. (malloc, realloc): If non-ANSI C, declare value as char *. diff -r 2de6f5e4858d -r 6d2e893b7ff7 src/m/alpha.h --- a/src/m/alpha.h Thu Jun 15 13:28:17 1995 +0000 +++ b/src/m/alpha.h Thu Jun 15 13:57:17 1995 +0000 @@ -169,12 +169,15 @@ #define LIBS_MACHINE -ldnet_stub #endif +#if 0 /* Rainer Schoepf 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 @@ /* 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 ();