use __inline__ instead of inline to avoid build errors with -ansi

SVN-Revision: 10051
master
Felix Fietkau 17 years ago
parent d1cb21fb01
commit cb9ce31a27
  1. 20
      toolchain/uClibc/patches/110-compat_macros.patch

@ -20,31 +20,31 @@ Index: uClibc-0.9.29/include/string.h
-# define rindex(s,c) strrchr((s), (c)) -# define rindex(s,c) strrchr((s), (c))
-# endif -# endif
+/* Copy N bytes of SRC to DEST (like memmove, but args reversed). */ +/* 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); + memmove(__dest, __src, __n);
+} +}
+ +
+/* Set N bytes of S to 0. */ +/* 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); + memset(__s, 0, __n);
+} +}
+ +
+/* Compare N bytes of S1 and S2 (same as memcmp). */ +/* 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); + return memcmp(__s1, __s2, __n);
+} +}
+ +
+/* Find the first occurrence of C in S (same as strchr). */ +/* 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); + return strchr(__s, __c);
+} +}
+ +
+/* Find the last occurrence of C in S (same as strrchr). */ +/* 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); + return strrchr(__s, __c);
+} +}
@ -66,31 +66,31 @@ Index: uClibc-0.9.29/include/strings.h
-# define rindex(s,c) strrchr((s), (c)) -# define rindex(s,c) strrchr((s), (c))
+ +
+/* Copy N bytes of SRC to DEST (like memmove, but args reversed). */ +/* 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); + memmove(__dest, __src, __n);
+} +}
+ +
+/* Set N bytes of S to 0. */ +/* 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); + memset(__s, 0, __n);
+} +}
+ +
+/* Compare N bytes of S1 and S2 (same as memcmp). */ +/* 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); + return memcmp(__s1, __s2, __n);
+} +}
+ +
+/* Find the first occurrence of C in S (same as strchr). */ +/* 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); + return strchr(__s, __c);
+} +}
+ +
+/* Find the last occurrence of C in S (same as strrchr). */ +/* 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); + return strrchr(__s, __c);
+} +}

Loading…
Cancel
Save