From: Martin Willi <martin@revosec.ch>
Date: Mon, 7 Jul 2014 12:48:11 +0000 (+0200)
Subject: utils: Undefine mem{cpy,move,set} if set before defining them
X-Git-Tag: 5.2.0~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=920d466f0559e7284884bcdbe605aad8b3665c17;p=thirdparty%2Fstrongswan.git

utils: Undefine mem{cpy,move,set} if set before defining them

Some platforms, such as OS X, use macros for these functions. Undefine them
to avoid compiler warnings.
---

diff --git a/src/libstrongswan/utils/utils.h b/src/libstrongswan/utils/utils.h
index 66d91a5954..1b822dd610 100644
--- a/src/libstrongswan/utils/utils.h
+++ b/src/libstrongswan/utils/utils.h
@@ -175,6 +175,9 @@ static inline void *memcpy_noop(void *dst, const void *src, size_t n)
 {
 	return n ? memcpy(dst, src, n) : dst;
 }
+#ifdef memcpy
+# undef memcpy
+#endif
 #define memcpy(d,s,n) memcpy_noop(d,s,n)
 
 /**
@@ -186,6 +189,9 @@ static inline void *memmove_noop(void *dst, const void *src, size_t n)
 {
 	return n ? memmove(dst, src, n) : dst;
 }
+#ifdef memmove
+# undef memmove
+#endif
 #define memmove(d,s,n) memmove_noop(d,s,n)
 
 /**
@@ -197,6 +203,9 @@ static inline void *memset_noop(void *s, int c, size_t n)
 {
 	return n ? memset(s, c, n) : s;
 }
+#ifdef memset
+# undef memset
+#endif
 #define memset(s,c,n) memset_noop(s,c,n)
 
 /**