From: spth <spth@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Sat, 27 Dec 2008 10:53:10 +0000 (+0000)
Subject: Fixed conflict with builtin memcpy()
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=ca03fcfaa870713b9a3517c7337ecf25c22ca6b0;hp=2f00ce617b44fd09d815a65d3489ed49fb8f65db;p=fw%2Fsdcc

Fixed conflict with builtin memcpy()

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5303 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/ChangeLog b/ChangeLog
index ef1b9c21..639347d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-27 Borut Razem <borut.razem AT siol.net>
+
+	* device/lib/_memcpy.c:
+	  fixed conflict with builtin memcpy()
+
 2008-12-26 Borut Razem <borut.razem AT siol.net>
 
 	* support/librarian/sdcclib.c:
diff --git a/device/lib/_memcpy.c b/device/lib/_memcpy.c
index c973f159..540c2cf2 100644
--- a/device/lib/_memcpy.c
+++ b/device/lib/_memcpy.c
@@ -26,6 +26,8 @@
 
 #if !_SDCC_PORT_PROVIDES_MEMCPY
 
+#undef memcpy /* Avoid conflict with builtin memcpy() in Z80 port */
+
 void * memcpy (
 	void * dst,
 	void * src,