Commit 71d4202f authored by Paul Eggert's avatar Paul Eggert

Merge from gnulib.

parent 6659b59c
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.
......
......@@ -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
......
......@@ -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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment