diff options
| author | Paul Eggert | 2017-11-25 22:28:31 -0800 |
|---|---|---|
| committer | Paul Eggert | 2017-11-25 22:48:09 -0800 |
| commit | 8be3aee2813f528b02bc913ca4d79e34e72b1754 (patch) | |
| tree | af1e8e35cedfe601076eade046a1a12303b93e84 /lib/allocator.h | |
| parent | 265cee553f9d59a989d92e28865f6cc6fc02dcc9 (diff) | |
| download | emacs-8be3aee2813f528b02bc913ca4d79e34e72b1754.tar.gz emacs-8be3aee2813f528b02bc913ca4d79e34e72b1754.zip | |
Merge from Gnulib
This incorporates:
2017-11-23 stat: work around Solaris bug with tv_nsec < 0
2017-11-12 maint: shorten https://lists.gnu.org/archive/html/... links
* build-aux/config.sub, doc/misc/texinfo.tex, lib/allocator.h:
* lib/fstatat.c, lib/intprops.h, lib/lstat.c, lib/signal.in.h:
* lib/stat-time.h, lib/stdio-impl.h, lib/stdio.in.h:
* lib/timespec.h, m4/alloca.m4, m4/extern-inline.m4:
* m4/faccessat.m4, m4/fstatat.m4, m4/gnulib-common.m4:
* m4/lstat.m4, m4/std-gnu11.m4, m4/sys_types_h.m4:
* m4/vararrays.m4:
Copy from Gnulib.
Diffstat (limited to 'lib/allocator.h')
| -rw-r--r-- | lib/allocator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/allocator.h b/lib/allocator.h index 8f79d7435c3..fc3d646aa54 100644 --- a/lib/allocator.h +++ b/lib/allocator.h | |||
| @@ -29,7 +29,7 @@ struct allocator | |||
| 29 | /* Do not use GCC attributes such as __attribute__ ((malloc)) with | 29 | /* Do not use GCC attributes such as __attribute__ ((malloc)) with |
| 30 | the function types pointed at by these members, because these | 30 | the function types pointed at by these members, because these |
| 31 | attributes do not work with pointers to functions. See | 31 | attributes do not work with pointers to functions. See |
| 32 | <https://lists.gnu.org/archive/html/bug-gnulib/2011-04/msg00007.html>. */ | 32 | <https://lists.gnu.org/r/bug-gnulib/2011-04/msg00007.html>. */ |
| 33 | 33 | ||
| 34 | /* Call ALLOCATE to allocate memory, like 'malloc'. On failure ALLOCATE | 34 | /* Call ALLOCATE to allocate memory, like 'malloc'. On failure ALLOCATE |
| 35 | should return NULL, though not necessarily set errno. When given | 35 | should return NULL, though not necessarily set errno. When given |