andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from gnulib: putenv: port to Solaris 10.

Browse source
This commit is contained in:
Paul Eggert 2013-03-13 00:15:17 -07:00
parent 7fd8c501a0
commit 2c3f72f4b5
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -1,6 +1,7 @@
2013-03-13 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-03-13 putenv: port to Solaris 10
2013-03-12 mktime: fix configure typo
2013-03-11 regex: port to mingw's recent addition of undeclared alarm
2013-03-11 putenv: avoid compilation warning on mingw

10
lib/putenv.c
View file

@ -62,7 +62,7 @@ static int
_unsetenv (const char *name)
{
size_t len;
#if !HAVE__PUTENV
#if !HAVE_DECL__PUTENV
char **ep;
#endif
@ -74,7 +74,7 @@ _unsetenv (const char *name)
len = strlen (name);
#if HAVE__PUTENV
#if HAVE_DECL__PUTENV
{
int putenv_result, putenv_errno;
char *name_ = malloc (len + 2);
@ -127,9 +127,9 @@ putenv (char *string)
return _unsetenv (string);
}
#if HAVE__PUTENV
#if HAVE_DECL__PUTENV
/* Rely on _putenv to allocate the new environment. If other
parts of the application use _putenv, the !HAVE__PUTENV code
parts of the application use _putenv, the !HAVE_DECL__PUTENV code
would fight over who owns the environ vector, causing a crash. */
if (name_end[1])
return _putenv (string);
@ -188,7 +188,7 @@ putenv (char *string)
last_environ = new_environ;
environ = new_environ;
}
#endif
return 0;
#endif
}

4
m4/putenv.m4
View file

@ -1,4 +1,4 @@
# putenv.m4 serial 19
# putenv.m4 serial 20
dnl Copyright (C) 2002-2013 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@ -52,5 +52,5 @@ AC_DEFUN([gl_FUNC_PUTENV],
# Prerequisites of lib/putenv.c.
AC_DEFUN([gl_PREREQ_PUTENV],
[
AC_CHECK_FUNCS([_putenv])
AC_CHECK_DECLS([_putenv])
])