diff options
author | Mirko Vogt <mirko@openwrt.org> | 2010-06-20 22:18:43 +0000 |
---|---|---|
committer | Mirko Vogt <mirko@openwrt.org> | 2010-06-20 22:18:43 +0000 |
commit | 9d0f9d3758fd1feb32021dc6c7e6f71833678400 (patch) | |
tree | 96717f2f0d533d71c9ca5fe92a2d6a3857f08cf8 /toolchain/uClibc/patches-0.9.30+nptl/110-compat_macros.patch | |
parent | 738b30afeba9c66ef4e0a30d80ee156b729cd45c (diff) | |
download | upstream-9d0f9d3758fd1feb32021dc6c7e6f71833678400.tar.gz upstream-9d0f9d3758fd1feb32021dc6c7e6f71833678400.tar.bz2 upstream-9d0f9d3758fd1feb32021dc6c7e6f71833678400.zip |
add support for uClibc version 0.9.32 based on git rev a7642511b08b0b8a4012bab67cb8aa554992df6b, this includes support for nptl which got merged into the uClibc master branch recently
SVN-Revision: 21856
Diffstat (limited to 'toolchain/uClibc/patches-0.9.30+nptl/110-compat_macros.patch')
-rw-r--r-- | toolchain/uClibc/patches-0.9.30+nptl/110-compat_macros.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/toolchain/uClibc/patches-0.9.30+nptl/110-compat_macros.patch b/toolchain/uClibc/patches-0.9.30+nptl/110-compat_macros.patch deleted file mode 100644 index 7659e465cc..0000000000 --- a/toolchain/uClibc/patches-0.9.30+nptl/110-compat_macros.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- ./include/string.h.orig 2008-06-08 22:38:53.000000000 +0200 -+++ ./include/string.h 2009-01-02 16:09:03.000000000 +0100 -@@ -355,18 +355,40 @@ - /* Find the last occurrence of C in S (same as strrchr). */ - extern char *rindex (__const char *__s, int __c) - __THROW __attribute_pure__ __nonnull ((1)); --# else --# ifdef __UCLIBC_SUSV3_LEGACY_MACROS__ -+# elif defined(__UCLIBC_SUSV3_LEGACY_MACROS__) && !defined(_STRINGS_H) - /* bcopy/bzero/bcmp/index/rindex are marked LEGACY in SuSv3. - * They are replaced as proposed by SuSv3. Don't sync this part - * with glibc and keep it in sync with strings.h. */ - --# define bcopy(src,dest,n) (memmove((dest), (src), (n)), (void) 0) --# define bzero(s,n) (memset((s), '\0', (n)), (void) 0) --# define bcmp(s1,s2,n) memcmp((s1), (s2), (size_t)(n)) --# define index(s,c) strchr((s), (c)) --# define rindex(s,c) strrchr((s), (c)) --# endif -+/* Copy N bytes of SRC to DEST (like memmove, but args reversed). */ -+static __inline__ void bcopy (__const void *__src, void *__dest, size_t __n) -+{ -+ memmove(__dest, __src, __n); -+} -+ -+/* Set N bytes of S to 0. */ -+static __inline__ void bzero (void *__s, size_t __n) -+{ -+ memset(__s, 0, __n); -+} -+ -+/* Compare N bytes of S1 and S2 (same as memcmp). */ -+static __inline__ int bcmp (__const void *__s1, __const void *__s2, size_t __n) -+{ -+ return memcmp(__s1, __s2, __n); -+} -+ -+/* Find the first occurrence of C in S (same as strchr). */ -+static __inline__ char *index (__const char *__s, int __c) -+{ -+ return strchr(__s, __c); -+} -+ -+/* Find the last occurrence of C in S (same as strrchr). */ -+static __inline__ char *rindex (__const char *__s, int __c) -+{ -+ return strrchr(__s, __c); -+} - # endif - - /* Return the position of the first bit set in I, or 0 if none are set. |