GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The file string.h is also included in romcc code, which has no malloc(). 

The patch adds proper preprocessor guards and drops the malloc() prototype
because that's in stdlib.h

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4441 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2009-07-19 00:18:15 +00:00 committed by Stefan Reinauer
parent 0c88655b03
commit 951f5882e2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/string.h
View File

@ -8,7 +8,6 @@ void *memcpy(void *dest, const void *src, size_t n);
void *memmove(void *dest, const void *src, size_t n); void *memmove(void *dest, const void *src, size_t n);
void *memset(void *s, int c, size_t n); void *memset(void *s, int c, size_t n);
int memcmp(const void *s1, const void *s2, size_t n); int memcmp(const void *s1, const void *s2, size_t n);
void *malloc(size_t size);
int sprintf(char * buf, const char *fmt, ...); int sprintf(char * buf, const char *fmt, ...);
// yes, linux has fancy ones. We don't care. This stuff gets used // yes, linux has fancy ones. We don't care. This stuff gets used
@ -45,6 +44,7 @@ static inline char *strchr(const char *s, int c)
return 0; return 0;
} }
#ifndef __ROMCC__
static inline char *strdup(const char *s) static inline char *strdup(const char *s)
{ {
size_t sz = strlen(s) + 1; size_t sz = strlen(s) + 1;
@ -52,6 +52,7 @@ static inline char *strdup(const char *s)
memcpy(d, s, sz); memcpy(d, s, sz);
return d; return d;
} }
#endif
static inline char *strncpy(char *to, const char *from, int count) static inline char *strncpy(char *to, const char *from, int count)
{ {