diff options
| author | Ken Brown | 2014-08-30 22:40:00 -0400 |
|---|---|---|
| committer | Ken Brown | 2014-08-30 22:40:00 -0400 |
| commit | f356dedfe3abd145c8f302c9be6b5e5ed9acacfc (patch) | |
| tree | fdd20983d24fe06e6e8892a2320f9af046138120 /src/ChangeLog | |
| parent | ced5a8f219b31402480b60c370d0045afe74a531 (diff) | |
| download | emacs-f356dedfe3abd145c8f302c9be6b5e5ed9acacfc.tar.gz emacs-f356dedfe3abd145c8f302c9be6b5e5ed9acacfc.zip | |
Fix bug#18368 with broken build on AIX due to HYBRID_MALLOC changes.
* src/gmalloc.c: Don't include <stdlib.h>. Declare system malloc and
friends before defining hybrid_malloc and friends if HYBRID_MALLOC
is defined. (Bug#18368)
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 00ec5dcf3d6..8f2e01f8cf9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-08-31 Ken Brown <kbrown@cornell.edu> | ||
| 2 | |||
| 3 | * gmalloc.c: Don't include <stdlib.h>. Declare system malloc and | ||
| 4 | friends before defining hybrid_malloc and friends if HYBRID_MALLOC | ||
| 5 | is defined. (Bug#18368) | ||
| 6 | |||
| 1 | 2014-08-30 Paul Eggert <eggert@cs.ucla.edu> | 7 | 2014-08-30 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 8 | ||
| 3 | Vector-sorting fixes (Bug#18361). | 9 | Vector-sorting fixes (Bug#18361). |