diff options
| author | Dave Love | 2000-09-07 09:49:56 +0000 |
|---|---|---|
| committer | Dave Love | 2000-09-07 09:49:56 +0000 |
| commit | b14654b94d9006bd5b375222ff9505212dc7d49d (patch) | |
| tree | 4022d091aed0d57185ff70f09bc4620584df7f8d | |
| parent | 96889af2bc3430521fc00b7d40afffbbc66259c4 (diff) | |
| download | emacs-b14654b94d9006bd5b375222ff9505212dc7d49d.tar.gz emacs-b14654b94d9006bd5b375222ff9505212dc7d49d.zip | |
[!SYSTEM_MALLOC && REL_ALLOC_MMAP]: Set mallocobj.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9504544ddda..5e13947f422 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2000-09-07 Dave Love <fx@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in [!SYSTEM_MALLOC && REL_ALLOC_MMAP]: Set mallocobj. | ||
| 4 | |||
| 1 | 2000-09-07 Kenichi Handa <handa@etl.go.jp> | 5 | 2000-09-07 Kenichi Handa <handa@etl.go.jp> |
| 2 | 6 | ||
| 3 | * charset.h (MAKE_CHAR): Be sure to set MSB of C1 to 0. | 7 | * charset.h (MAKE_CHAR): Be sure to set MSB of C1 to 0. |
diff --git a/src/Makefile.in b/src/Makefile.in index aaa20be4192..a4f2c51721b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -583,6 +583,12 @@ mallocobj = gmalloc.o vm-limit.o | |||
| 583 | #endif /* ! defined (REL_ALLOC) */ | 583 | #endif /* ! defined (REL_ALLOC) */ |
| 584 | #endif /* ! defined (DOUG_LEA_MALLOC) */ | 584 | #endif /* ! defined (DOUG_LEA_MALLOC) */ |
| 585 | 585 | ||
| 586 | #else /* ! SYSTEM_MALLOC */ | ||
| 587 | |||
| 588 | #ifdef REL_ALLOC_MMAP | ||
| 589 | mallocobj = ralloc.o vm-limit.o | ||
| 590 | #endif | ||
| 591 | |||
| 586 | #endif /* SYSTEM_MALLOC */ | 592 | #endif /* SYSTEM_MALLOC */ |
| 587 | 593 | ||
| 588 | 594 | ||