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:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user