Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[packages] uclibc++: remove conflicting inline declarations
git-svn-id: svn://svn.openwrt.org/openwrt/packages@30953 3c298f89-4303-0410-b956-a3cf2f4a3e73
- Loading branch information
jow
committed
Mar 16, 2012
1 parent
066f726
commit 505107f
Showing
2 changed files
with
36 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
--- a/include/cstring | ||
+++ b/include/cstring | ||
@@ -47,31 +47,6 @@ namespace std{ | ||
using ::strstr; | ||
using ::strtok; | ||
using ::strxfrm; | ||
- | ||
- | ||
- //Extra definitions required in c++ spec | ||
- | ||
- | ||
- inline void* memchr(void* s, int c, size_t n){ | ||
- return memchr(const_cast<const void *>(s), c, n); | ||
- } | ||
- | ||
- inline char* strchr(char* s, int c){ | ||
- return strchr(const_cast<const char *>(s), c); | ||
- } | ||
- | ||
- inline char* strpbrk(char* s1, const char* s2){ | ||
- return strpbrk(const_cast<const char *>(s1), s2); | ||
- } | ||
- | ||
- inline char* strrchr(char* s, int c){ | ||
- return strrchr(const_cast<const char *>(s), c); | ||
- } | ||
- | ||
- inline char* strstr(char* s1, const char* s2){ | ||
- return strstr(const_cast<const char *>(s1), s2); | ||
- } | ||
- | ||
} | ||
|
||
#endif |