mac-osx-105-environ.patch

diff -urN -x 'Makefile*' -x '*comp.sh' -x libtool -x x-to-1 -x stamp-h1 -x POTFILES -x gettext.sh -x '*config*' gettext-0.17/gettext-runtime/gnulib-lib/setenv.c gettext-0.17-mine/gettext-runtime/gnulib-lib/setenv.c
--- gettext-0.17/gettext-runtime/gnulib-lib/setenv.c	2007-10-07 22:28:16.000000000 +0200
+++ gettext-0.17-mine/gettext-runtime/gnulib-lib/setenv.c	2009-09-13 20:11:21.000000000 +0200
@@ -39,7 +39,8 @@
 #if !_LIBC
 # define __environ	environ
 # ifndef HAVE_ENVIRON_DECL
-extern char **environ;
+#  include <crt_externs.h>
+#  define environ (*_NSGetEnviron())
 # endif
 #endif
 
diff -urN -x 'Makefile*' -x '*comp.sh' -x libtool -x x-to-1 -x stamp-h1 -x POTFILES -x gettext.sh -x '*config*' gettext-0.17/gettext-tools/gnulib-lib/execute.c gettext-0.17-mine/gettext-tools/gnulib-lib/execute.c
--- gettext-0.17/gettext-tools/gnulib-lib/execute.c	2007-10-07 22:29:19.000000000 +0200
+++ gettext-0.17-mine/gettext-tools/gnulib-lib/execute.c	2009-09-13 20:12:00.000000000 +0200
@@ -55,7 +55,8 @@
 #endif
 
 #if ! HAVE_ENVIRON_DECL
-extern char **environ;
+# include <crt_externs.h>
+# define environ (*_NSGetEnviron())
 #endif
 
 #ifndef STDIN_FILENO
diff -urN -x 'Makefile*' -x '*comp.sh' -x libtool -x x-to-1 -x stamp-h1 -x POTFILES -x gettext.sh -x '*config*' gettext-0.17/gettext-tools/gnulib-lib/pipe.c gettext-0.17-mine/gettext-tools/gnulib-lib/pipe.c
--- gettext-0.17/gettext-tools/gnulib-lib/pipe.c	2007-10-07 22:29:34.000000000 +0200
+++ gettext-0.17-mine/gettext-tools/gnulib-lib/pipe.c	2009-09-13 20:12:37.000000000 +0200
@@ -54,7 +54,8 @@
 #endif
 
 #if ! HAVE_ENVIRON_DECL
-extern char **environ;
+# include <crt_externs.h>
+# define environ (*_NSGetEnviron())
 #endif
 
 #ifndef STDIN_FILENO
diff -urN -x 'Makefile*' -x '*comp.sh' -x libtool -x x-to-1 -x stamp-h1 -x POTFILES -x gettext.sh -x '*config*' gettext-0.17/gettext-tools/gnulib-lib/setenv.c gettext-0.17-mine/gettext-tools/gnulib-lib/setenv.c
--- gettext-0.17/gettext-tools/gnulib-lib/setenv.c	2007-10-07 22:29:34.000000000 +0200
+++ gettext-0.17-mine/gettext-tools/gnulib-lib/setenv.c	2009-09-13 20:12:55.000000000 +0200
@@ -39,7 +39,8 @@
 #if !_LIBC
 # define __environ	environ
 # ifndef HAVE_ENVIRON_DECL
-extern char **environ;
+#  include <crt_externs.h>
+#  define environ (*_NSGetEnviron())
 # endif
 #endif
 
diff -urN -x 'Makefile*' -x '*comp.sh' -x libtool -x x-to-1 -x stamp-h1 -x POTFILES -x gettext.sh -x '*config*' gettext-0.17/gettext-tools/gnulib-lib/unsetenv.c gettext-0.17-mine/gettext-tools/gnulib-lib/unsetenv.c
--- gettext-0.17/gettext-tools/gnulib-lib/unsetenv.c	2007-10-07 22:29:39.000000000 +0200
+++ gettext-0.17-mine/gettext-tools/gnulib-lib/unsetenv.c	2009-09-13 20:13:11.000000000 +0200
@@ -28,7 +28,8 @@
 #if !_LIBC
 # define __environ	environ
 # ifndef HAVE_ENVIRON_DECL
-extern char **environ;
+#  include <crt_externs.h>
+#  define environ (*_NSGetEnviron())
 # endif
 #endif