diff options
| author | Bernd Schmidt <bernds_cb1@t-online.de> | 2008-06-04 14:02:56 +0000 |
|---|---|---|
| committer | Bernd Schmidt <bernds_cb1@t-online.de> | 2008-06-04 14:02:56 +0000 |
| commit | 6d7aed92f2715b3db4472b748fef06f1eaf6b30e (patch) | |
| tree | bb9b3359ac32888f3ffdfbe01b5bea7729085050 /include | |
| parent | 542bc8ee466d7a42c85bc160ab2b6529410211d6 (diff) | |
| download | uClibc-alpine-6d7aed92f2715b3db4472b748fef06f1eaf6b30e.tar.bz2 uClibc-alpine-6d7aed92f2715b3db4472b748fef06f1eaf6b30e.tar.xz | |
This fixes a problem with the move of libc_hidden_proto to string.h.
The obsolete functions bcopy, index, etc. are not supposed to be used within
uClibc itself. Hence, there is no libc_hidden_def for them, but the previous
patch did not just move libc_hidden_protos, it also added new ones for the
legacy functions. As a result, programs which use these functions can no
longer link with uClibc.
This fixes it by removing the unnecessary libc_hidden_protos. I've also
removed all inclusions of <strings.h> from uClibc source files: since we
define _GNU_SOURCE, it is sufficient to include <string.h>. We then do not
need to duplicate the libc_hidden_proto block in <strings.h>.
Diffstat (limited to 'include')
| -rw-r--r-- | include/string.h | 9 | ||||
| -rw-r--r-- | include/strings.h | 18 |
2 files changed, 3 insertions, 24 deletions
diff --git a/include/string.h b/include/string.h index cd57de1a5..5c631de52 100644 --- a/include/string.h +++ b/include/string.h @@ -503,13 +503,8 @@ libc_hidden_proto(strerror) libc_hidden_proto(__bzero) #endif #ifdef __USE_BSD -# ifdef __UCLIBC_SUSV3_LEGACY__ -libc_hidden_proto(bcopy) -libc_hidden_proto(bzero) -libc_hidden_proto(bcmp) -libc_hidden_proto(index) -libc_hidden_proto(rindex) -# endif +/* No libc_hidden_proto for bcopy etc., since uClibc doesn't itself use the + legacy functions. */ libc_hidden_proto(ffs) #if 0 /*def __USE_GNU*/ libc_hidden_proto(ffsl) diff --git a/include/strings.h b/include/strings.h index 89349f94d..550f4ab9c 100644 --- a/include/strings.h +++ b/include/strings.h @@ -92,23 +92,7 @@ __END_DECLS #ifdef UCLIBC_INTERNAL -/* In the same order and with the same defines */ -# ifdef __UCLIBC_SUSV3_LEGACY__ -libc_hidden_proto(bcopy) -libc_hidden_proto(bzero) -libc_hidden_proto(bcmp) -libc_hidden_proto(index) -libc_hidden_proto(rindex) -# endif -libc_hidden_proto(ffs) -# if 0 /*def __USE_GNU*/ -libc_hidden_proto(ffsl) -# ifdef __GNUC__ -libc_hidden_proto(ffsll) -# endif -# endif -libc_hidden_proto(strcasecmp) -libc_hidden_proto(strncasecmp) +#error "<strings.h> should not be included from libc." #endif |