about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--misc/getttyent.c6
-rw-r--r--misc/syslog.c3
-rw-r--r--misc/tsearch.c2
4 files changed, 9 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index d508605dfd..18d91c9096 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2017-08-31  Florian Weimer  <fweimer@redhat.com>
 
+	* misc/getttyent.c (skip, value): Remove internal_function.
+	* misc/syslog.c (openlog_internal): Likewise.
+	* misc/tsearch.c (trecurse, tdestroy_recurse): Likewise.
+
+2017-08-31  Florian Weimer  <fweimer@redhat.com>
+
 	* include/nss.h (__nss_valid_field, __nss_valid_list_field)
 	(__nss_rewrite_field): Remove internal_function.
 	* nscd/nscd_getgr_r.c (nscd_getgr_r): Likewise.
diff --git a/misc/getttyent.c b/misc/getttyent.c
index 73002f52d1..0fa4ddbdde 100644
--- a/misc/getttyent.c
+++ b/misc/getttyent.c
@@ -57,8 +57,8 @@ __getttynam (const char *tty)
 }
 weak_alias (__getttynam, getttynam)
 
-static char *skip (char *) __THROW internal_function;
-static char *value (char *) __THROW internal_function;
+static char *skip (char *) __THROW;
+static char *value (char *) __THROW;
 
 struct ttyent *
 __getttyent (void)
@@ -141,7 +141,6 @@ weak_alias (__getttyent, getttyent)
  * the next field.
  */
 static char *
-internal_function
 skip (char *p)
 {
 	char *t;
@@ -175,7 +174,6 @@ skip (char *p)
 }
 
 static char *
-internal_function
 value (char *p)
 {
 
diff --git a/misc/syslog.c b/misc/syslog.c
index 6922ad685c..2b6bd373bc 100644
--- a/misc/syslog.c
+++ b/misc/syslog.c
@@ -72,7 +72,7 @@ extern char	*__progname;		/* Program name, from crt0. */
 /* Define the lock.  */
 __libc_lock_define_initialized (static, syslog_lock)
 
-static void openlog_internal(const char *, int, int) internal_function;
+static void openlog_internal(const char *, int, int);
 static void closelog_internal(void);
 #ifndef NO_SIGPIPE
 static void sigpipe_handler (int);
@@ -330,7 +330,6 @@ static struct sockaddr_un SyslogAddr;	/* AF_UNIX address of local logger */
 
 
 static void
-internal_function
 openlog_internal(const char *ident, int logstat, int logfac)
 {
 	if (ident != NULL)
diff --git a/misc/tsearch.c b/misc/tsearch.c
index 5e2e7986d3..aef9c7c1ee 100644
--- a/misc/tsearch.c
+++ b/misc/tsearch.c
@@ -684,7 +684,6 @@ weak_alias (__tdelete, tdelete)
    ROOT is the root of the tree to be walked, ACTION the function to be
    called at each node.  LEVEL is the level of ROOT in the whole tree.  */
 static void
-internal_function
 trecurse (const void *vroot, __action_fn_t action, int level)
 {
   const_node root = (const_node) vroot;
@@ -725,7 +724,6 @@ weak_alias (__twalk, twalk)
 /* The standardized functions miss an important functionality: the
    tree cannot be removed easily.  We provide a function to do this.  */
 static void
-internal_function
 tdestroy_recurse (node root, __free_fn_t freefct)
 {
   if (LEFT(root) != NULL)