The branch, 2.0.x, has been updated.
- Log -----------------------------------------------------------------
commit 9670fabe972d7bfd58dfa7350dd3ad974ffcb91d
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Thu Mar 28 14:02:21 2013 +0100
Putenv requires a char *, for some reason.
diff --git a/src/support/environment.cpp b/src/support/environment.cpp
index dfdc2d4..a353922 100644
--- a/src/support/environment.cpp
+++ b/src/support/environment.cpp
@@ -129,10 +129,10 @@ bool unsetEnv(string const & name)
{
#if defined(HAVE_UNSETENV)
// FIXME: does it leak?
- return unsetenv(name.c_str()) == 0;
+ return ::unsetenv(name.c_str()) == 0;
#elif defined(HAVE_PUTENV)
// This is OK with MSVC and MinGW at least.
- return putenv((name + "=").c_str()) == 0;
+ return ::putenv(const_cast<char*>((name + "=").c_str())) == 0;
#else
#error No environment-unsetting function has been defined.
#endif
-----------------------------------------------------------------------
Summary of changes:
src/support/environment.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
The LyX Source Repository
