diff options
| author | Peter Stephenson <pws@zsh.org> | 2014-06-09 09:50:37 +0100 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2014-06-09 09:50:37 +0100 |
| commit | 6336347c9e02ebae565b2d62987d1052bcba5567 (patch) | |
| tree | c57790ed50fa12ab04733286bd10990d59fb13d0 /Src/zsh_system.h | |
| parent | 2ba4aa275e548ae9d4406e3bc8008bdfa1ce29eb (diff) | |
| parent | 4f4d2b8247ef08e34fe73d91c0a8d8a2eb1f18c7 (diff) | |
| download | zsh-6336347c9e02ebae565b2d62987d1052bcba5567.tar.gz zsh-6336347c9e02ebae565b2d62987d1052bcba5567.tar.xz zsh-6336347c9e02ebae565b2d62987d1052bcba5567.zip | |
fix my own merge conflict with grammar changes
Diffstat (limited to 'Src/zsh_system.h')
| -rw-r--r-- | Src/zsh_system.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Src/zsh_system.h b/Src/zsh_system.h index e68fd62f9..6887a135b 100644 --- a/Src/zsh_system.h +++ b/Src/zsh_system.h @@ -708,7 +708,10 @@ struct timezone { #endif #ifndef HAVE_MEMMOVE -# define memmove(dest, src, len) bcopy((src), (dest), (len)) +# ifndef memmove +static char *zmmv; +# define memmove(dest, src, len) (bcopy((src), zmmv = (dest), (len)), zmmv) +# endif #endif #ifndef offsetof |