time: Remove the internal_function attribute

diff --git a/ChangeLog b/ChangeLog
index 8df8a365788af133fea6abe5f6bfb3ba991df69e..1f547eeb3817a8b51330b6188d5f8376e9ff7379 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-08-31  Florian Weimer  <fweimer@redhat.com>
+
+       * include/time.h (__tz_compute, __strptime_internal): Remove
+       internal_function.
+       * time/strptime_l.c (__strptime_internal): Likewise.
+       * time/tzset.c (compute_change, update_vars, __tz_compute): Likewise.
+
 2017-08-31  Florian Weimer  <fweimer@redhat.com>
 
        * iconv/gconv.c (__gconv): Remove internal_function.
@@ -63,6 +70,8 @@
        * time/lc-time-cleanup.c (_nl_cleanup_time): Likewise.
        * wcsmbs/wcsmbsload.c (__wcsmbs_load_conv, __wcsmbs_clone_conv)
        (__wcsmbs_named_conv, _nl_cleanup_ctype): Likewise.
+       * wcsmbs/wcsmbsload.h (__wcsmbs_load_conv, __wcsmbs_clone_conv)
+       (__wcsmbs_named_conv, _nl_cleanup_ctype): Likewise.
 
 2017-08-31  Florian Weimer  <fweimer@redhat.com>
 

diff --git a/include/time.h b/include/time.h
index 73696082ccae3cbdac01586b14ce86a55ec98068..324913214f1530021174b6352dc26a7a5f1150ef 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -46,7 +46,7 @@ extern void __tzfile_default (const char *std, const char *dst,
                              long int stdoff, long int dstoff);
 extern void __tzset_parse_tz (const char *tz);
 extern void __tz_compute (time_t timer, struct tm *tm, int use_localtime)
-     __THROW internal_function;
+  __THROW;
 
 /* Subroutine of `mktime'.  Return the `time_t' representation of TP and
    normalize TP, given that a `struct tm *' maps to a `time_t' as performed
@@ -89,8 +89,7 @@ extern int __getclktck (void);
 /* strptime support.  */
 extern char * __strptime_internal (const char *rp, const char *fmt,
                                   struct tm *tm, void *statep,
-                                  locale_t locparam)
-     internal_function;
+                                  locale_t locparam);
 
 extern double __difftime (time_t time1, time_t time0);
 

diff --git a/time/strptime_l.c b/time/strptime_l.c
index 185619e14277edc76d387a05d702b5580a3966e8..3afc33a74ec85b117c7c30720a0f47cb4e05bf1b 100644 (file)
--- a/time/strptime_l.c
+++ b/time/strptime_l.c
@@ -231,7 +231,6 @@ day_of_the_year (struct tm *tm)
 
 #ifdef _LIBC
 char *
-internal_function
 #else
 static char *
 #endif

diff --git a/time/tzset.c b/time/tzset.c
index cf5fe969b6a3eb6f9625407260194f9f9f414199..b5e95204b83a81133160a4064719f65207e4f3a2 100644 (file)
--- a/time/tzset.c
+++ b/time/tzset.c
@@ -63,7 +63,7 @@ typedef struct
 static tz_rule tz_rules[2];
 
 
-static void compute_change (tz_rule *rule, int year) __THROW internal_function;
+static void compute_change (tz_rule *rule, int year) __THROW;
 static void tzset_internal (int always);
 \f
 /* List of buffers containing time zone strings. */
@@ -125,7 +125,6 @@ __tzstring (const char *s)
 static char *old_tz;
 
 static void
-internal_function
 update_vars (void)
 {
   __daylight = tz_rules[0].offset != tz_rules[1].offset;
@@ -429,7 +428,6 @@ tzset_internal (int always)
    when the change described by RULE will occur and
    put it in RULE->change, saving YEAR in RULE->computed_for.  */
 static void
-internal_function
 compute_change (tz_rule *rule, int year)
 {
   time_t t;
@@ -518,7 +516,6 @@ compute_change (tz_rule *rule, int year)
 /* Figure out the correct timezone for TM and set `__tzname',
    `__timezone', and `__daylight' accordingly.  */
 void
-internal_function
 __tz_compute (time_t timer, struct tm *tm, int use_localtime)
 {
   compute_change (&tz_rules[0], 1900 + tm->tm_year);