From: Wolfgang Denk Date: Fri, 12 Mar 2010 22:57:55 +0100 Subject: [U-Boot] [PATCH v2] standalone eepro100_eeprom: fix build error In-Reply-To: <1268430226-7624-1-git-send-email-wd@denx.de> References: <1268430226-7624-1-git-send-email-wd@denx.de> Message-ID: <1268431075-9663-1-git-send-email-wd@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Building examples/standalone/eepro100_eeprom triggers this error: In file included from include/common.h:629, from eepro100_eeprom.c:24: include/net.h: In function 'NetReadIP': include/net.h:430: warning: implicit declaration of function 'memcpy' eepro100_eeprom.c: At top level: eepro100_eeprom.c:81: error: conflicting types for 'memcpy' include/net.h:430: error: previous implicit declaration of 'memcpy' was here Fix this. Signed-off-by: Wolfgang Denk --- v2: delete line previously just commented out for testing examples/standalone/eepro100_eeprom.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/examples/standalone/eepro100_eeprom.c b/examples/standalone/eepro100_eeprom.c index 2b15d05..771a7e8 100644 --- a/examples/standalone/eepro100_eeprom.c +++ b/examples/standalone/eepro100_eeprom.c @@ -18,7 +18,6 @@ */ /* avoid unnecessary memcpy function */ -#define __HAVE_ARCH_MEMCPY #define _PPC_STRING_H_ #include @@ -77,7 +76,7 @@ static inline short inw(long addr) return swap16(*(volatile short *)(addr)); } -static inline void *memcpy(void *dst, const void *src, unsigned int len) +void *memcpy(void *dst, const void *src, unsigned int len) { char *ret = dst; while (len-- > 0) { -- 1.6.6.1