diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-02 00:41:37 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-02 00:41:37 +0000 |
| commit | 9acef89e60381a298801e4b221d66b1538072b28 (patch) | |
| tree | 76643b24b4f8fc6590e392672102e5b30499ba73 /libc/misc/regex | |
| parent | a4a74b5760c426cede2ef36d35cb873f98b9f17b (diff) | |
| download | uClibc-alpine-9acef89e60381a298801e4b221d66b1538072b28.tar.bz2 uClibc-alpine-9acef89e60381a298801e4b221d66b1538072b28.tar.xz | |
Merge from trunk. More to come you betcha'.
Diffstat (limited to 'libc/misc/regex')
| -rw-r--r-- | libc/misc/regex/regex.c | 9 | ||||
| -rw-r--r-- | libc/misc/regex/regex_old.c | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libc/misc/regex/regex.c b/libc/misc/regex/regex.c index 5e09af6d9..d367211c5 100644 --- a/libc/misc/regex/regex.c +++ b/libc/misc/regex/regex.c @@ -44,6 +44,15 @@ extern wctype_t __wctype (__const char *__property) attribute_hidden; extern int __iswctype (wint_t __wc, wctype_t __desc) /*attribute_hidden*/; #endif + +#define memcmp __memcmp +#define memcpy __memcpy +#define memmove __memmove +#define memset __memset +#define strchr __strchr +#define strcmp __strcmp +#define strlen __strlen +#define strncpy __strncpy #endif /* Make sure noone compiles this code with a C++ compiler. */ diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c index 3e9d2eb30..69b77c4c3 100644 --- a/libc/misc/regex/regex_old.c +++ b/libc/misc/regex/regex_old.c @@ -21,7 +21,6 @@ 02111-1307 USA. */ #define HAVE_MEMPCPY -#define __mempcpy __libc_mempcpy #define memset __memset #define memcmp __memcmp #define strcmp __strcmp @@ -40,7 +39,7 @@ #define STDC_HEADERS #define RE_TRANSLATE_TYPE char * -extern void *__libc_mempcpy (void *__restrict __dest, +extern void *__mempcpy (void *__restrict __dest, __const void *__restrict __src, size_t __n) /*attribute_hidden*/; /* AIX requires this to be the first thing in the file. */ |