X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/bd858493e61b687dda9b1014555830502c7ddd82..b2a2f4ac351fdba38c378fc6b5f303007ab0ad4f:/toolchain/uClibc/patches/110-compat_macros.patch

diff --git a/toolchain/uClibc/patches/110-compat_macros.patch b/toolchain/uClibc/patches/110-compat_macros.patch
index 78ef04b60..ebb0f3114 100644
--- a/toolchain/uClibc/patches/110-compat_macros.patch
+++ b/toolchain/uClibc/patches/110-compat_macros.patch
@@ -1,8 +1,15 @@
 Index: uClibc-0.9.29/include/string.h
 ===================================================================
 --- uClibc-0.9.29.orig/include/string.h	2007-12-30 00:44:19.638696968 +0100
-+++ uClibc-0.9.29/include/string.h	2007-12-30 00:52:36.655020316 +0100
-@@ -326,11 +326,35 @@
++++ uClibc-0.9.29/include/string.h	2007-12-30 01:12:52.097715154 +0100
+@@ -320,18 +320,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.  */
  
@@ -11,38 +18,39 @@ Index: uClibc-0.9.29/include/string.h
 -#  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)
++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)
++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)
++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)
++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)
++static __inline__ char *rindex (__const char *__s, int __c)
 +{
 +	return strrchr(__s, __c);
 +}
- #  endif
  # endif
  
+ /* Return the position of the first bit set in I, or 0 if none are set.
 Index: uClibc-0.9.29/include/strings.h
 ===================================================================
 --- uClibc-0.9.29.orig/include/strings.h	2007-12-30 00:49:00.462700217 +0100
@@ -58,31 +66,31 @@ Index: uClibc-0.9.29/include/strings.h
 -#  define rindex(s,c) strrchr((s), (c))
 +
 +/* Copy N bytes of SRC to DEST (like memmove, but args reversed).  */
-+static inline void bcopy (__const void *__src, void *__dest, size_t __n)
++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)
++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)
++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)
++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)
++static __inline__ char *rindex (__const char *__s, int __c)
 +{
 +	return strrchr(__s, __c);
 +}