diff options
Diffstat (limited to 'time')
-rw-r--r-- | time/Versions | 8 | ||||
-rw-r--r-- | time/mktime.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/time/Versions b/time/Versions index a7c263008c..fd838181e4 100644 --- a/time/Versions +++ b/time/Versions @@ -1,7 +1,7 @@ libc { GLIBC_2.0 { # global variables - __timezone; __daylight; __tzname; + __daylight; __timezone; __tzname; # functions with special/multiple interfaces __adjtimex; @@ -51,13 +51,13 @@ libc { wcsftime; } GLIBC_2.3 { + # these internal names are used by libstdc++ + __strftime_l; __wcsftime_l; + # s* strftime_l; # w* wcsftime_l; - - # these internal names are used by libstdc++ - __strftime_l; __wcsftime_l; } GLIBC_2.3.2 { strptime_l; diff --git a/time/mktime.c b/time/mktime.c index 688969be87..e75132c2e4 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -196,7 +196,7 @@ isdst_differ (int a, int b) The result may overflow. It is the caller's responsibility to detect overflow. */ -static inline time_t +static time_t ydhms_diff (long_int year1, long_int yday1, int hour1, int min1, int sec1, int year0, int yday0, int hour0, int min0, int sec0) { |