[Emacs-diffs] /srv/bzr/emacs/trunk r111740: Merge from gnulib.

[Paul Eggert]

------------------------------------------------------------
revno: 111740
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2013-02-11 15:15:46 -0800
message:
  Merge from gnulib.
modified:
  ChangeLog
  lib/stdlib.in.h
  lib/unsetenv.c

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-02-11 00:55:26 +0000
+++ b/ChangeLog 2013-02-11 23:15:46 +0000
@@ -1,3 +1,9 @@
+2013-02-11  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        * configure.ac (emacs_config_options): Record some env vars.

=== modified file 'lib/stdlib.in.h'
--- a/lib/stdlib.in.h   2013-02-08 23:37:17 +0000
+++ b/lib/stdlib.in.h   2013-02-11 23:15:46 +0000
@@ -773,7 +773,7 @@
 _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

=== modified file 'lib/unsetenv.c'
--- a/lib/unsetenv.c    2013-01-02 16:37:04 +0000
+++ b/lib/unsetenv.c    2013-02-11 23:15:46 +0000
@@ -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>