From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 11 Feb 2013 23:15:46 +0000 (-0800)
Subject: Merge from gnulib.
X-Git-Tag: emacs-24.3.90~173^2~7^2~83
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=71d4202f204ea5fad93eb34406f0ef671630f271;p=emacs.git

Merge from gnulib.
---

diff --git a/ChangeLog b/ChangeLog
index 9cb50f67d7b..d5ca6c17b54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Merge from gnulib, incorporating:
+	2013-02-11 unsetenv etc.: port to Solaris 11 + GNU Emacs
+	2013-02-09 secure_getenv: fix C++ declaration typo
+
 2013-02-11  Glenn Morris  <rgm@gnu.org>
 
 	* configure.ac (emacs_config_options): Record some env vars.
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index e054c520ebe..c9552480e5d 100644
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -773,7 +773,7 @@ _GL_WARN_ON_USE (rpmatch, "rpmatch is unportable - "
 _GL_FUNCDECL_SYS (secure_getenv, char *,
                   (char const *name) _GL_ARG_NONNULL ((1)));
 # endif
-_GL_CXXALIAS_SYS (secure_getenv, int, (char const *name));
+_GL_CXXALIAS_SYS (secure_getenv, char *, (char const *name));
 _GL_CXXALIASWARN (secure_getenv);
 #elif defined GNULIB_POSIXCHECK
 # undef secure_getenv
diff --git a/lib/unsetenv.c b/lib/unsetenv.c
index eea21129031..c58c82f4f44 100644
--- a/lib/unsetenv.c
+++ b/lib/unsetenv.c
@@ -14,12 +14,12 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
-
 /* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
    optimizes away the name == NULL test below.  */
 #define _GL_ARG_NONNULL(params)
 
+#include <config.h>
+
 /* Specification.  */
 #include <stdlib.h>