From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Wed, 22 Feb 2023 12:06:57 +0000 (+0200)
Subject: lib: lib - Remove memcpy macro in C++
X-Git-Tag: 2.4.0~2957
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67939a5b9ac9b71140a1f5dfe24b9b45555a42b8;p=thirdparty%2Fdovecot%2Fcore.git

lib: lib - Remove memcpy macro in C++

This breaks C++ compilation due to too wide impact.

Broken in 38dbeec767ad10021020e3833b1dbc3d04442f85
---

diff --git a/src/lib/lib.h b/src/lib/lib.h
index 16dc71f589..38345ac0ec 100644
--- a/src/lib/lib.h
+++ b/src/lib/lib.h
@@ -72,7 +72,9 @@ static inline void *i_memcpy(void *dest, const void *src, size_t n) {
 	i_assert(dest != NULL && src != NULL);
 	return memcpy(dest, src, n);
 }
-#define memcpy(dest, src, n) i_memcpy(dest, src, n)
+#ifndef __cplusplus
+#  define memcpy(dest, src, n) i_memcpy(dest, src, n)
+#endif
 
 /* /dev/null opened as O_WRONLY. Opened at lib_init(), so it can be accessed
    also inside chroots. */