aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2006-06-05 20:32:33 +0000
committerTom Tromey <tromey@gcc.gnu.org>2006-06-05 20:32:33 +0000
commit8a398c2c8a42e5310d64b30944f7b17afa33e278 (patch)
treed83e909a8143ae727350096c7d4922f9d9b35a4c
parent0c397f9c8d2ff963d61aba9836af1efe3b82e464 (diff)
downloadgcc-8a398c2c8a42e5310d64b30944f7b17afa33e278.zip
gcc-8a398c2c8a42e5310d64b30944f7b17afa33e278.tar.gz
gcc-8a398c2c8a42e5310d64b30944f7b17afa33e278.tar.bz2
re PR libgcj/27892 (gij.cc:104: error: 'setenv' was not declared in this scope)
PR libgcj/27892: * gij.cc (main): Use putenv. From-SVN: r114410
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/gij.cc7
2 files changed, 11 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 15913cc..a45de6c 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-05 Tom Tromey <tromey@redhat.com>
+
+ PR libgcj/27892:
+ * gij.cc (main): Use putenv.
+
2006-06-03 Paolo Bonzini <bonzini@gnu.org>
* scripts/jar.in: Ensure return with argument has non-empty argument.
diff --git a/libjava/gij.cc b/libjava/gij.cc
index 933fe50..817378f 100644
--- a/libjava/gij.cc
+++ b/libjava/gij.cc
@@ -101,7 +101,12 @@ main (int argc, char const** argv)
if (! libpath || strcmp (libpath, newpath))
{
- setenv (LTDL_SHLIBPATH_VAR, newpath, 1);
+ char *buffer = (char *) JvMalloc (strlen (LTDL_SHLIBPATH_VAR)
+ + strlen (newpath) + 2);
+ strcpy (buffer, LTDL_SHLIBPATH_VAR);
+ strcat (buffer, "=");
+ strcat (buffer, newpath);
+ putenv (buffer);
JvFree (newpath);
int error_code = execvp (argv[0], (char* const*) argv);