diff options
| author | Paul Eggert | 2014-06-01 23:08:49 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-06-01 23:08:49 -0700 |
| commit | f34897e34def565eb6e07461549ab2ba2e275e95 (patch) | |
| tree | bc10ac505eaf666c52f1a400e6e9216e1356aa63 /src/ChangeLog | |
| parent | f2ea2ac3f506d14eaaad89b30d315d8bd15b429f (diff) | |
| download | emacs-f34897e34def565eb6e07461549ab2ba2e275e95.tar.gz emacs-f34897e34def565eb6e07461549ab2ba2e275e95.zip | |
Improve AIX-related merge from emacs-24.
* conf_post.h (FLEXIBLE_ARRAY_MEMBER): Fix comment.
* lisp.h (ENUMABLE) [!_AIX]: Don't define to 0 merely because we're
not on AIX; since we're on the trunk we can use enums more broadly.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2881574684c..c68adfcb5b1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2014-06-02 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2014-06-02 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | Improve AIX-related merge from emacs-24. | ||
| 4 | * conf_post.h (FLEXIBLE_ARRAY_MEMBER): Fix comment. | ||
| 5 | * lisp.h (ENUMABLE) [!_AIX]: Don't define to 0 merely because we're | ||
| 6 | not on AIX; since we're on the trunk we can use enums more broadly. | ||
| 7 | |||
| 3 | * frame.c (x_set_frame_parameters): Don't read uninitialized storage. | 8 | * frame.c (x_set_frame_parameters): Don't read uninitialized storage. |
| 4 | 9 | ||
| 5 | 2014-06-02 Jan Djärv <jan.h.d@swipnet.se> | 10 | 2014-06-02 Jan Djärv <jan.h.d@swipnet.se> |