Ticket #2458: 2458-base.dpatch

1 patch for repository darcs.haskell.org:/srv/darcs/packages/base:

Fri Apr  1 13:19:36 BST 2011  Max Bolingbroke <batterseapower@hotmail.com>
  * Use NSGetEnviron on OS X

New patches:

[Use NSGetEnviron on OS X
Max Bolingbroke <batterseapower@hotmail.com>**20110401121936
 Ignore-this: dc33082555e084f3241b6d48f178f903
] {
hunk ./include/HsBase.h 655
 }
 #endif /* !defined(__MINGW32__) */
 
+#if darwin_HOST_OS
+// You should not access _environ directly on Darwin in a bundle/shared library.
+// See #2458 and http://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man7/environ.7.html
+#include <crt_externs.h>
+INLINE char **__hscore_environ() { return *(_NSGetEnviron()); }
+#else
 /* ToDo: write a feature test that doesn't assume 'environ' to
  *    be in scope at link-time. */
 extern char** environ;
hunk ./include/HsBase.h 665
 INLINE char **__hscore_environ() { return environ; }
+#endif
 
 /* lossless conversions between pointers and integral types */
 INLINE void *    __hscore_from_uintptr(uintptr_t n) { return (void *)n; }
}

Context:

[TAG git migration
Malcolm.Wallace@cs.york.ac.uk**20110331135041
 Ignore-this: f953c722de899f1df8fed5802dfd3535
] 
Patch bundle hash:
bfd3550c0b1300e701666e716e15653b5ea2f04a