The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 78be5467e1eec376bbe2dc38cd5ae87284834f80
Merge: ac7d08c a1edd7b
Author: Uwe Stöhr <[email protected]>
Date:   Fri Feb 15 16:28:38 2013 +0100

    Merge branch 'master' of git.lyx.org:lyx


commit ac7d08cb327115630ee0a160d416d2ad7283046f
Author: Uwe Stöhr <[email protected]>
Date:   Fri Feb 15 16:28:02 2013 +0100

    environment.cpp: MSVC compile fix
    
    MSVC told me
    "environment.cpp(139): error C4716: 'lyx::support::unsetEnv' : must return 
a value"

diff --git a/src/support/environment.cpp b/src/support/environment.cpp
index 6deb230..dfdc2d4 100644
--- a/src/support/environment.cpp
+++ b/src/support/environment.cpp
@@ -132,7 +132,7 @@ bool unsetEnv(string const & name)
        return unsetenv(name.c_str()) == 0;
 #elif defined(HAVE_PUTENV)
        // This is OK with MSVC and MinGW at least.
-       putenv((name + "=").c_str()) == 0;
+       return putenv((name + "=").c_str()) == 0;
 #else
 #error No environment-unsetting function has been defined.
 #endif

-----------------------------------------------------------------------

Summary of changes:
 src/support/environment.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to