use unsetenv() instead of setenv(var, NULL) which is invalid

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-07 22:29:07 +00:00
parent 3c0f8ed250
commit a1353ea496
5 changed files with 112 additions and 0 deletions
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -1098,6 +1098,15 @@ bool wxGetEnv(const wxString& var, wxString *value)
 static bool wxDoSetEnv(const wxString& variable, const char *value)
 {
 #if defined(HAVE_SETENV)
+    if ( !value )
+    {
+#ifdef HAVE_UNSETENV
+        return unsetenv(variable.mb_str()) == 0;
+#else
+        value = ""; // we can't pass NULL to setenv()
+#endif
+    }
+
    return setenv(variable.mb_str(), value, 1 /* overwrite */) == 0;
 #elif defined(HAVE_PUTENV)
    wxString s = variable;