gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / doc / alloca-opt.texi

diff --git a/doc/alloca-opt.texi b/doc/alloca-opt.texi
index 3fea8f3..4e14e70 100644 (file)
--- a/doc/alloca-opt.texi
+++ b/doc/alloca-opt.texi
@@ -1,9 +1,9 @@
 @c Documentation of gnulib module 'alloca-opt'.
 
-@c Copyright (C) 2004, 2007 Free Software Foundation, Inc.
+@c Copyright (C) 2004, 2007, 2009-2013 Free Software Foundation, Inc.
 
 @c Permission is granted to copy, distribute and/or modify this document
-@c under the terms of the GNU Free Documentation License, Version 1.2 or
+@c under the terms of the GNU Free Documentation License, Version 1.3 or
 @c any later version published by the Free Software Foundation; with no
 @c Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
 @c Texts.  A copy of the license is included in the ``GNU Free
@@ -22,7 +22,7 @@ HAVE_ALLOCA.
 The user can @code{#include <alloca.h>} on all platforms, and use
 @code{alloca} on those platforms where the preprocessor macro HAVE_ALLOCA
 evaluates to true. If HAVE_ALLOCA is false, the code should use a heap-based
-memory allocation based on @code{malloc} or - in C++ - @code{new}. Note that
+memory allocation based on @code{malloc} or (in C++) @code{new}. Note that
 the @code{#include <alloca.h>} must be the first one after the
 autoconf-generated @file{config.h}, for AIX 3 compatibility. Thanks to IBM for
 this nice restriction!