diff options
| author | Jim Blandy | 1992-11-16 00:27:51 +0000 |
|---|---|---|
| committer | Jim Blandy | 1992-11-16 00:27:51 +0000 |
| commit | dc9d84de6a42cf48d0aad31b72bf00569b932b0a (patch) | |
| tree | 5543673f44aa0326868c5d854a1df908b37a580b /src | |
| parent | 8a8fa7233da495aa3249f9ad70ac357e663b0ece (diff) | |
| download | emacs-dc9d84de6a42cf48d0aad31b72bf00569b932b0a.tar.gz emacs-dc9d84de6a42cf48d0aad31b72bf00569b932b0a.zip | |
* 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')
| -rw-r--r-- | src/m/pmax.h | 5 |
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 */ | |||
| 28 | #define DATA_START 0x10000000 | 28 | #define DATA_START 0x10000000 |
| 29 | #define DATA_SEG_BITS 0x10000000 | 29 | #define DATA_SEG_BITS 0x10000000 |
| 30 | 30 | ||
| 31 | #if 0 | ||
| 32 | /* I don't see any such conflict in Ultrix 4.2, 4.2a, or 4.3. And | ||
| 33 | the relocating allocator is a real win. -JimB */ | ||
| 34 | |||
| 31 | /* In Ultrix 4.1, XvmsAlloc.o in libX11.a seems to insist | 35 | /* In Ultrix 4.1, XvmsAlloc.o in libX11.a seems to insist |
| 32 | on defining malloc itself. This should avoid conflicting with it. */ | 36 | on defining malloc itself. This should avoid conflicting with it. */ |
| 33 | #define SYSTEM_MALLOC | 37 | #define SYSTEM_MALLOC |
| 38 | #endif | ||
| 34 | 39 | ||
| 35 | /* Override what m-mips.h says about this. */ | 40 | /* Override what m-mips.h says about this. */ |
| 36 | #undef LINKER | 41 | #undef LINKER |