summaryrefslogtreecommitdiff
path: root/lib/putenv.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2013-03-13 00:15:17 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2013-03-13 00:15:17 -0700
commit2c3f72f4b5f7d00cf0131998957c24812c8f6a53 (patch)
tree88a4070dc895f0cb525f35ad7e1dc4614356ca9f /lib/putenv.c
parent7fd8c501a0de9e2f52a3ba6989646e3aa391649f (diff)
downloademacs-2c3f72f4b5f7d00cf0131998957c24812c8f6a53.tar.gz
Merge from gnulib: putenv: port to Solaris 10.
Diffstat (limited to 'lib/putenv.c')
-rw-r--r--lib/putenv.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/putenv.c b/lib/putenv.c
index 3813a11ece7..5461273084e 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -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
}