Created attachment 1856 patch-environ.diff Darwin (as in Mac OS X) does not have a variable named environ, but has a function which you can get the environ variable with.
Looks fine to me; checked in.