diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2006-03-22 15:49:22 +0000 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2006-03-22 15:49:22 +0000 |
| commit | 55b24e4e95a715b451507f2790d292fa8b1c2c1c (patch) | |
| tree | ae6464b93a9b660617b9f7a569276945294dcce7 /libc/misc/regex/regex_old.c | |
| parent | 86ea254301f7e2fcd860c4072c0a938b4e048d42 (diff) | |
Mark some functions as GNU, provide missing hidden memmem, remove _ISOC99/XOPEN_SOURCE
Diffstat (limited to 'libc/misc/regex/regex_old.c')
| -rw-r--r-- | libc/misc/regex/regex_old.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c index 29640734d..cf5843ec5 100644 --- a/libc/misc/regex/regex_old.c +++ b/libc/misc/regex/regex_old.c @@ -26,7 +26,9 @@ #ifdef __UCLIBC__ # undef _LIBC # define _REGEX_RE_COMP -# define HAVE_MEMPCPY +# ifdef __USE_GNU +# define HAVE_MEMPCPY +# endif # define STDC_HEADERS # define RE_TRANSLATE_TYPE char * #endif @@ -41,8 +43,10 @@ libc_hidden_proto(memcpy) libc_hidden_proto(strcmp) libc_hidden_proto(strlen) libc_hidden_proto(printf) -libc_hidden_proto(mempcpy) libc_hidden_proto(abort) +#ifdef __USE_GNU +libc_hidden_proto(mempcpy) +#endif /* AIX requires this to be the first thing in the file. */ #if defined _AIX && !defined REGEX_MALLOC @@ -8281,7 +8285,7 @@ regerror (errcode, preg, errbuf, errbuf_size) { if (msg_size > errbuf_size) { -#if defined HAVE_MEMPCPY || defined _LIBC +#if (defined HAVE_MEMPCPY || defined _LIBC) && defined __USE_GNU *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; #else memcpy (errbuf, msg, errbuf_size - 1); |