aboutsummaryrefslogtreecommitdiffstats
path: root/lib/allocator.h
diff options
context:
space:
mode:
authorPaul Eggert2017-09-17 12:56:00 -0700
committerPaul Eggert2017-09-17 13:06:54 -0700
commit6bbbc38b3421723521f7cdd4fd617a4fc889aceb (patch)
tree9cc9d4cd249578118ae6b22da617935a760cc891 /lib/allocator.h
parent57249fb297237bb942ead1f7a0af0ac20811a9cf (diff)
downloademacs-6bbbc38b3421723521f7cdd4fd617a4fc889aceb.tar.gz
emacs-6bbbc38b3421723521f7cdd4fd617a4fc889aceb.zip
Merge from Gnulib
This incorporates: 2017-09-16 manywarnings: port to GCC on 64-bit MS-Windows 2017-09-13 all: Replace many more http URLs by https URLs * build-aux/config.guess, build-aux/config.sub: * build-aux/gitlog-to-changelog, doc/misc/texinfo.tex: * lib/allocator.h, lib/count-leading-zeros.h: * lib/count-trailing-zeros.h, lib/dup2.c, lib/filevercmp.c: * lib/fstatat.c, lib/fsync.c, lib/ftoastr.c, lib/ftoastr.h: * lib/intprops.h, lib/signal.in.h, lib/stdio-impl.h, lib/stdio.in.h: * lib/unistd.in.h, lib/utimens.c, m4/alloca.m4, m4/extern-inline.m4: * m4/fstatat.m4, m4/gnulib-common.m4, m4/manywarnings.m4: * m4/std-gnu11.m4, m4/sys_types_h.m4, m4/vararrays.m4: Copy from Gnulib. * lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'lib/allocator.h')
-rw-r--r--lib/allocator.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/allocator.h b/lib/allocator.h
index 2ecbf1a3795..8f79d7435c3 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 <http://lists.gnu.org/archive/html/bug-gnulib/2011-04/msg00007.html>. */ 32 <https://lists.gnu.org/archive/html/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