[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112031: Merge from gnulib: putenv: p
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112031: Merge from gnulib: putenv: port to Solaris 10. |
Date: |
Wed, 13 Mar 2013 00:15:17 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 112031
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2013-03-13 00:15:17 -0700
message:
Merge from gnulib: putenv: port to Solaris 10.
modified:
ChangeLog
lib/putenv.c
m4/putenv.m4
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-03-13 00:38:42 +0000
+++ b/ChangeLog 2013-03-13 07:15:17 +0000
@@ -1,6 +1,7 @@
2013-03-13 Paul Eggert <address@hidden>
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
=== modified file 'lib/putenv.c'
--- a/lib/putenv.c 2013-03-13 00:38:42 +0000
+++ b/lib/putenv.c 2013-03-13 07:15:17 +0000
@@ -62,7 +62,7 @@
_unsetenv (const char *name)
{
size_t len;
-#if !HAVE__PUTENV
+#if !HAVE_DECL__PUTENV
char **ep;
#endif
@@ -74,7 +74,7 @@
len = strlen (name);
-#if HAVE__PUTENV
+#if HAVE_DECL__PUTENV
{
int putenv_result, putenv_errno;
char *name_ = malloc (len + 2);
@@ -127,9 +127,9 @@
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 @@
last_environ = new_environ;
environ = new_environ;
}
-#endif
return 0;
+#endif
}
=== modified file 'm4/putenv.m4'
--- a/m4/putenv.m4 2013-03-01 15:16:43 +0000
+++ b/m4/putenv.m4 2013-03-13 07:15:17 +0000
@@ -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 @@
# Prerequisites of lib/putenv.c.
AC_DEFUN([gl_PREREQ_PUTENV],
[
- AC_CHECK_FUNCS([_putenv])
+ AC_CHECK_DECLS([_putenv])
])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112031: Merge from gnulib: putenv: port to Solaris 10.,
Paul Eggert <=