From 4f4d2b8247ef08e34fe73d91c0a8d8a2eb1f18c7 Mon Sep 17 00:00:00 2001
From: Nikolas Garofil <nikolas@garofil.be>
Date: Sat, 7 Jun 2014 13:48:40 -0700
Subject: 32737, 32736 (32741), 32735, 32734, 32733, 32732 (32739): Strict
 compilation fixes

	Src/utils.c: properly ifdef declarations
	Src/zsh_system.h: memmove() should return its dest argument
	Src/signals.c: define ret before use
	Src/mem.c: remove unused pointers
	Src/prototypes.h: use size_t in bcopy()
	Src/compat.c: fix const declaration inconsistency
---
 Src/zsh_system.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Src/zsh_system.h')

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
-- 
cgit 1.4.1