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 ef1b9c21e4bdcee78ebda71c09fb71e4a72ac126..639347d2a92689dd23c8a3e76976335b70a7596c 100644 (file)
--- 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 c973f159d9a43c6cc8f0af70eee309bbcbef6872..540c2cf296e9f6ff51b84b5ea3de2dc4c65aaa8c 100644 (file)
--- 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,