diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | include/time.h | 5 | ||||
| -rw-r--r-- | time/strptime_l.c | 1 | ||||
| -rw-r--r-- | time/tzset.c | 5 |
4 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 8df8a36578..1f547eeb38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 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. * iconv/gconv_builtin.c (__gconv_get_builtin_trans): Likewise. * iconv/gconv_cache.c (__gconv_load_cache, find_module_idx) @@ -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 73696082cc..324913214f 100644 --- 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 185619e142..3afc33a74e 100644 --- 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 cf5fe969b6..b5e95204b8 100644 --- 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); /* 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); |