diff options
| author | Paul Eggert | 2013-10-03 00:06:52 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-10-03 00:06:52 -0700 |
| commit | 0a858ebfc57a072ae8ab65f509d8a4901a2ec073 (patch) | |
| tree | dd81bcdf11f3d3efa32ffe00f7cdc90d3c1144d9 /src/ChangeLog | |
| parent | b52f569dcfc5c2e1b764c89d27ea8699a44228e6 (diff) | |
| download | emacs-0a858ebfc57a072ae8ab65f509d8a4901a2ec073.tar.gz emacs-0a858ebfc57a072ae8ab65f509d8a4901a2ec073.zip | |
Merge from gnulib.
* src/conf_post.h (__has_builtin, assume): Remove; gnulib now does these.
* src/lisp.h: Include <verify.h>, for 'assume'.
This also incorpoprates:
2013-10-02 verify: new macro 'assume'
2013-09-26 dup2, dup3: work around another cygwin crasher
2013-09-26 getdtablesize: work around cygwin issue
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8a0d8863548..8713d493dca 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2013-10-03 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2013-10-03 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | Adjust to merge from gnulib. | ||
| 4 | * conf_post.h (__has_builtin, assume): Remove; gnulib now does these. | ||
| 5 | * lisp.h: Include <verify.h>, for 'assume'. | ||
| 6 | |||
| 3 | * eval.c (clobbered_eassert): New macro. | 7 | * eval.c (clobbered_eassert): New macro. |
| 4 | (internal_catch, internal_condition_case) | 8 | (internal_catch, internal_condition_case) |
| 5 | (internal_condition_case_1, internal_condition_case_2) | 9 | (internal_condition_case_1, internal_condition_case_2) |