diff options
| author | Florian Weimer <fweimer@redhat.com> | 2017-08-10 16:06:52 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2017-08-10 16:06:52 +0200 |
| commit | f87cc2bfba9b844da48a63441c6099342b1551c7 (patch) | |
| tree | 99cd6df10a20b8183d212a3f66b9e49399e20c7a | |
| parent | eac43cbb8d808a40004aa0a4a286f5c5155beccb (diff) | |
| download | glibc-f87cc2bfba9b844da48a63441c6099342b1551c7.tar.gz glibc-f87cc2bfba9b844da48a63441c6099342b1551c7.tar.xz glibc-f87cc2bfba9b844da48a63441c6099342b1551c7.zip | |
__inet6_scopeid_pton: Remove attribute_hidden, internal_function
The hidden attribute was overridden by libc_hidden_proto on GNU/Linux. It is incorrect because the function is used from nscd. internal_function is not supposed to be used across DSO boundaries, so this commit removes it (again, due to the use in nscd).
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | inet/inet6_scopeid_pton.c | 2 | ||||
| -rw-r--r-- | inet/net-internal.h | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 01d04fb25d..6648ce1676 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2017-08-10 Florian Weimer <fweimer@redhat.com> + * inet/net-internal.h (__inet6_scopeid_pton): Remove + attribute_hidden, internal_function. + * inet/inet6_scopeid_pton.c (__inet6_scopeid_pton): Remove + internal_function. + +2017-08-10 Florian Weimer <fweimer@redhat.com> + * malloc/malloc.c (get_max_fast): Reimplement as an inline function which calls __builtin_unreachable. diff --git a/inet/inet6_scopeid_pton.c b/inet/inet6_scopeid_pton.c index e09b1cb34d..cc8803fa10 100644 --- a/inet/inet6_scopeid_pton.c +++ b/inet/inet6_scopeid_pton.c @@ -28,7 +28,7 @@ /* Parse SOURCE as a scope ID for ADDRESS. Return 0 on success and -1 on error. */ -internal_function int +int __inet6_scopeid_pton (const struct in6_addr *address, const char *scope, uint32_t *result) { diff --git a/inet/net-internal.h b/inet/net-internal.h index 2b2632c7ba..b2135893e8 100644 --- a/inet/net-internal.h +++ b/inet/net-internal.h @@ -25,8 +25,7 @@ #include <sys/time.h> int __inet6_scopeid_pton (const struct in6_addr *address, - const char *scope, uint32_t *result) - internal_function attribute_hidden; + const char *scope, uint32_t *result); libc_hidden_proto (__inet6_scopeid_pton) |