summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--Src/zsh_system.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3be09c62a..cb0aa41bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
on a file touched by the -N test, so it must always be touched even
when the filesystem is noatime
+ * 38432: Src/zsh_system.h: avoid nonstandard setenv() on __APPLE__
+
2016-05-09 Barton E. Schaefer <schaefer@zsh.org>
* unposted: Functions/Zle/bracketed-paste-magic: update documentary
diff --git a/Src/zsh_system.h b/Src/zsh_system.h
index 811340d42..17c4c645e 100644
--- a/Src/zsh_system.h
+++ b/Src/zsh_system.h
@@ -728,7 +728,7 @@ extern char **environ;
* We always need setenv and unsetenv in pairs, because
* we don't know how to do memory management on the values set.
*/
-#if defined(HAVE_SETENV) && defined(HAVE_UNSETENV)
+#if defined(HAVE_SETENV) && defined(HAVE_UNSETENV) && !defined(__APPLE__)
# define USE_SET_UNSET_ENV
#endif