This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.26-68-gf87cc2b
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 10 Aug 2017 14:13:43 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.26-68-gf87cc2b
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via f87cc2bfba9b844da48a63441c6099342b1551c7 (commit)
from eac43cbb8d808a40004aa0a4a286f5c5155beccb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f87cc2bfba9b844da48a63441c6099342b1551c7
commit f87cc2bfba9b844da48a63441c6099342b1551c7
Author: Florian Weimer <fweimer@redhat.com>
Date: Thu Aug 10 16:06:52 2017 +0200
__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).
diff --git a/ChangeLog b/ChangeLog
index 01d04fb..6648ce1 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 e09b1cb..cc8803f 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 2b2632c..b213589 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)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
inet/inet6_scopeid_pton.c | 2 +-
inet/net-internal.h | 3 +--
3 files changed, 9 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources