# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1360443540 18000
# Node ID fea72d94801364b1bde7cdf83237a49fe4db508a
# Parent  d69dfef8e8c69c9092ecf09902f6e7fa746e732e# Parent  0fb629c87fb59fc68da3ca2dfb149fe39502d08d
pull and merge upstream changes to default branch

diff -r d69dfef8e8c6 -r fea72d948013 ChangeLog
--- a/ChangeLog	Sat Feb 09 15:11:07 2013 -0500
+++ b/ChangeLog	Sat Feb 09 15:59:00 2013 -0500
@@ -1,3 +1,10 @@
+2013-02-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+	secure_getenv: fix C++ declaration typo
+	* lib/stdlib.in.h (secure_getenv): Fix typo with return type
+	in _GL_CXXALIAS_SYS macro.  Reported by John W. Eaton in
+	<http://lists.gnu.org/archive/html/bug-gnulib/2013-02/msg00057.html>.
+
 2013-02-08  Paul Eggert  <eggert@cs.ucla.edu>
 
 	careadlinkat: stop exporting careadlinkatcwd