summaryrefslogtreecommitdiff
path: root/src/m
diff options
context:
space:
mode:
authorJim Blandy <jimb@redhat.com>1992-11-16 00:27:51 +0000
committerJim Blandy <jimb@redhat.com>1992-11-16 00:27:51 +0000
commit104011f7801e2e08b4a7d4cfb5d46f969825b631 (patch)
tree7d724c82de3e3f2b8427e57f40ebdde49f10b155 /src/m
parent9c5029a1992b01200258b77e715b90495083f74a (diff)
downloademacs-104011f7801e2e08b4a7d4cfb5d46f969825b631.tar.gz
* m/pmax.h: Don't define SYSTEM_MALLOC; this was only necessary
for Ultrix version 4.1, and the current version is 4.3.
Diffstat (limited to 'src/m')
-rw-r--r--src/m/pmax.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/m/pmax.h b/src/m/pmax.h
index 71e0fbb18b2..f99a3e2399e 100644
--- a/src/m/pmax.h
+++ b/src/m/pmax.h
@@ -28,9 +28,14 @@ NOTE-END */
#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