diff options
| author | Stephen Leake <stephen_leake@stephe-leake.org> | 2014-12-24 07:42:40 -0600 |
|---|---|---|
| committer | Stephen Leake <stephen_leake@stephe-leake.org> | 2014-12-24 07:42:40 -0600 |
| commit | f3be0025481f15717198befe557208614e513e92 (patch) | |
| tree | c514ddea4da4b688c92d12f557f471c4edd1e990 /doc | |
| parent | b4161ac70e4206cc00263e0c1f765b4cf95dfd33 (diff) | |
| parent | 882370eaa4f7ad6a88396dfdc64f896c727f87f4 (diff) | |
| download | emacs-f3be0025481f15717198befe557208614e513e92.tar.gz | |
resolve ChangeLog merge conflict
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/internals.texi | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 5b3750697c8..3621c563d79 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2014-12-22 Paul Eggert <eggert@cs.ucla.edu> + + Remove obsolete references to pre-C99 builds + * internals.texi (C Integer Types): Don't mention pre-C99 compilers. + 2014-12-19 Martin Rudalics <rudalics@gmx.at> * windows.texi (Resizing Windows): Describe new argument of diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index db6ed41268c..092ec003fb5 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi @@ -1684,8 +1684,7 @@ using @code{int}. Although it is also OK to use @code{int}, @code{0} and @code{1}, this older style is gradually being phased out. When using @code{bool}, respect the limitations of the replacement implementation of @code{bool}, as documented in the source file -@file{lib/stdbool.in.h}, so that Emacs remains portable to pre-C99 -platforms. In particular, boolean bitfields should be of type +@file{lib/stdbool.in.h}. In particular, boolean bitfields should be of type @code{bool_bf}, not @code{bool}, so that they work correctly even when compiling Objective C with standard GCC. |