projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't include agp_backend.h in user-visible part of agpgart.h
[powerpc.git]
/
lib
/
string.c
diff --git
a/lib/string.c
b/lib/string.c
index
037a48a
..
064f631
100644
(file)
--- a/
lib/string.c
+++ b/
lib/string.c
@@
-362,6
+362,7
@@
size_t strspn(const char *s, const char *accept)
EXPORT_SYMBOL(strspn);
#endif
EXPORT_SYMBOL(strspn);
#endif
+#ifndef __HAVE_ARCH_STRCSPN
/**
* strcspn - Calculate the length of the initial substring of @s which does
* not contain letters in @reject
/**
* strcspn - Calculate the length of the initial substring of @s which does
* not contain letters in @reject
@@
-384,6
+385,7
@@
size_t strcspn(const char *s, const char *reject)
return count;
}
EXPORT_SYMBOL(strcspn);
return count;
}
EXPORT_SYMBOL(strcspn);
+#endif
#ifndef __HAVE_ARCH_STRPBRK
/**
#ifndef __HAVE_ARCH_STRPBRK
/**
@@
-468,7
+470,7
@@
EXPORT_SYMBOL(memset);
void *memcpy(void *dest, const void *src, size_t count)
{
char *tmp = dest;
void *memcpy(void *dest, const void *src, size_t count)
{
char *tmp = dest;
- char *s = src;
+ c
onst c
har *s = src;
while (count--)
*tmp++ = *s++;
while (count--)
*tmp++ = *s++;