# HG changeset patch # User Jim Blandy # Date 721873671 0 # Node ID 689f1697d28591e80190314d2756dc95551241d1 # Parent 9de0900ca56aa0e75e3b57f13bc0897795da985a * m/pmax.h: Don't define SYSTEM_MALLOC; this was only necessary for Ultrix version 4.1, and the current version is 4.3. diff -r 9de0900ca56a -r 689f1697d285 src/m/pmax.h --- a/src/m/pmax.h Sun Nov 15 23:57:39 1992 +0000 +++ b/src/m/pmax.h Mon Nov 16 00:27:51 1992 +0000 @@ -28,9 +28,14 @@ #define DATA_START 0x10000000 #define DATA_SEG_BITS 0x10000000 +#if 0 +/* I don't see any such conflict in Ultrix 4.2, 4.2a, or 4.3. And + the relocating allocator is a real win. -JimB */ + /* In Ultrix 4.1, XvmsAlloc.o in libX11.a seems to insist on defining malloc itself. This should avoid conflicting with it. */ #define SYSTEM_MALLOC +#endif /* Override what m-mips.h says about this. */ #undef LINKER