Bug 327502 use of setenv breaks solaris build

r=benjamin sr=neil a=benjamin


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@191380 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ginn.chen%sun.com
2006-02-28 10:15:48 +00:00
parent bf8f9059fc
commit c7f405e95b
2 changed files with 12 additions and 8 deletions

View File

@@ -1573,12 +1573,14 @@ int main(int argc, char* argv[])
#ifdef MOZ_ACCESSIBILITY_ATK
// Reset GTK_MODULES, strip atk-bridge if exists
// Mozilla will load libatk-bridge.so later if necessary
const char* gtkModules = getenv("GTK_MODULES");
if (gtkModules) {
const char* gtkModules = PR_GetEnv("GTK_MODULES");
if (gtkModules && *gtkModules) {
nsCString gtkModulesStr(gtkModules);
gtkModulesStr.ReplaceSubstring("atk-bridge", "");
char* newGtkModules = strdup(gtkModulesStr.get());
setenv("GTK_MODULES", newGtkModules, 1);
char* expr = PR_smprintf("GTK_MODULES=%s", gtkModulesStr.get());
if (expr)
PR_SetEnv(expr);
// We intentionally leak |expr| here since it is required by PR_SetEnv.
}
#endif