summaryrefslogtreecommitdiff
path: root/libc/time/Versions
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2013-03-03 17:10:55 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2013-03-03 17:10:55 +0000
commitd15f124ff59606604c0243ee19cd67bc99ecd09f (patch)
treef0b18e431b15b797d5f5dc980928cd1a26b8f74a /libc/time/Versions
parentc1078e9067234e88d5c1ca8af18ae67b64141d66 (diff)
Merge changes between r22241 and r22552 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@22553 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/time/Versions')
-rw-r--r--libc/time/Versions8
1 files changed, 4 insertions, 4 deletions
diff --git a/libc/time/Versions b/libc/time/Versions
index a7c263008..fd838181e 100644
--- a/libc/time/Versions
+++ b/libc/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;