summaryrefslogtreecommitdiff
path: root/libc/misc/regex
diff options
context:
space:
mode:
Diffstat (limited to 'libc/misc/regex')
-rw-r--r--libc/misc/regex/regex.c9
-rw-r--r--libc/misc/regex/regex_old.c5
2 files changed, 11 insertions, 3 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..cdf2f940a 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,8 +39,8 @@
#define STDC_HEADERS
#define RE_TRANSLATE_TYPE char *
-extern void *__libc_mempcpy (void *__restrict __dest,
- __const void *__restrict __src, size_t __n) /*attribute_hidden*/;
+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. */
#if defined _AIX && !defined REGEX_MALLOC