diff options
author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-02-25 04:03:33 +0000 |
---|---|---|
committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-02-25 04:03:33 +0000 |
commit | cb6a88484ce0b5ffba2fe98a40e2d51f4af92eb8 (patch) | |
tree | 520f8e8d113184cfa7954ebd274564b8c255fa9a /libc/string/generic/memchr.c | |
parent | e4461be66e2655058aef358b00050bc70ac72861 (diff) | |
download | uClibc-alpine-cb6a88484ce0b5ffba2fe98a40e2d51f4af92eb8.tar.bz2 uClibc-alpine-cb6a88484ce0b5ffba2fe98a40e2d51f4af92eb8.tar.xz |
Merge from trunk. Going pretty good so far. Kind of. Okay, not really.
Diffstat (limited to 'libc/string/generic/memchr.c')
-rw-r--r-- | libc/string/generic/memchr.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libc/string/generic/memchr.c b/libc/string/generic/memchr.c index 68c820814..4bda5d758 100644 --- a/libc/string/generic/memchr.c +++ b/libc/string/generic/memchr.c @@ -25,12 +25,15 @@ #include <stdlib.h> #include <limits.h> +libc_hidden_proto(memchr) +libc_hidden_proto(abort) + #include "memcopy.h" #define LONG_MAX_32_BITS 2147483647 /* Search no more than N bytes of S for C. */ -void attribute_hidden *__memchr (const void * s, int c_in, size_t n) +void *memchr (const void * s, int c_in, size_t n) { const unsigned char *char_ptr; const unsigned long int *longword_ptr; @@ -171,5 +174,4 @@ void attribute_hidden *__memchr (const void * s, int c_in, size_t n) return 0; } - -strong_alias(__memchr,memchr) +libc_hidden_def(memchr) |