diff options
| author | Richard M. Stallman | 2002-05-05 04:30:45 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2002-05-05 04:30:45 +0000 |
| commit | 6b529d78beca9f45326d9ec3433299713090ee26 (patch) | |
| tree | d90945ece54fa888d4b13cbe61865c31fa1c7996 /src | |
| parent | 2fab432898e38d3b76d384011360cb0ea83a0559 (diff) | |
| download | emacs-6b529d78beca9f45326d9ec3433299713090ee26.tar.gz emacs-6b529d78beca9f45326d9ec3433299713090ee26.zip | |
[DOUG_LEA_MALLOC] (REL_ALLOC): Undefine it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/s/gnu.h | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c453a73256d..a79a2eafc4e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2002-05-05 Richard M. Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * s/gnu.h [DOUG_LEA_MALLOC] (REL_ALLOC): Undefine it. | ||
| 4 | |||
| 1 | 2002-05-04 Jason Rumney <jasonr@gnu.org> | 5 | 2002-05-04 Jason Rumney <jasonr@gnu.org> |
| 2 | 6 | ||
| 3 | * keyboard.c (make_lispy_event) <mouse-wheel>: Set count to 1 | 7 | * keyboard.c (make_lispy_event) <mouse-wheel>: Set count to 1 |
diff --git a/src/s/gnu.h b/src/s/gnu.h index bc2c1fcfb3a..807ff80378b 100644 --- a/src/s/gnu.h +++ b/src/s/gnu.h | |||
| @@ -60,6 +60,11 @@ Boston, MA 02111-1307, USA. */ | |||
| 60 | #undef BSD_PGRPS | 60 | #undef BSD_PGRPS |
| 61 | #define GETPGRP_NO_ARG | 61 | #define GETPGRP_NO_ARG |
| 62 | 62 | ||
| 63 | /* Use mmap directly for allocating larger buffers. */ | ||
| 64 | #ifdef DOUG_LEA_MALLOC | ||
| 65 | #undef REL_ALLOC | ||
| 66 | #endif | ||
| 67 | |||
| 63 | #define HAVE_WAIT_HEADER | 68 | #define HAVE_WAIT_HEADER |
| 64 | #define WAIT_USE_INT | 69 | #define WAIT_USE_INT |
| 65 | #define HAVE_UNION_WAIT | 70 | #define HAVE_UNION_WAIT |