summaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-01-19 10:11:00 +0000
committerUlrich Drepper <drepper@redhat.com>1999-01-19 10:11:00 +0000
commit36fe9ac901177d677c7dced4b71e5fcd8c68a32d (patch)
treeda8e39df0b8df30cdab9befe1ad66fec35c5ee60 /time
parent1ca8b61adeabc83e3ba81f0f6aaa43df70ca98d1 (diff)
downloadglibc-36fe9ac901177d677c7dced4b71e5fcd8c68a32d.tar.gz
Update.
1999-01-19 Ulrich Drepper <drepper@cygnus.com> * math/Makefile (libm-calls): Rename s_nextafterx to s_nexttoward. * math/Versions: Likewise. * math/bits/mathcalls.h: Likewise. * manual/arith.texi: Likewise. * sysdeps/libm-ieee754/s_nextafterl.c: Likewise. * sysdeps/libm-ieee754/s_nextafterx.c: Replaced by... * sysdeps/libm-ieee754/s_nexttoward.c: New file. * sysdeps/libm-ieee754/s_nextafterxf.c: Replaced by... * sysdeps/libm-ieee754/s_nexttowardf.c: New file. * sysdeps/libm-ieee754/s_nextafterxl.c: Replaced by... * sysdeps/libm-ieee754/s_nexttowardl.c: New file. * time/Makefile (routines): Removed strfxtime. * time/Versions: Likewise. * time/strfxtime.c: Removed. * time/time.h: Remove _LOCALTIME, _NO_LEAP_SECONDS, struct tmx, mkxtime, and strfxtime.
Diffstat (limited to 'time')
-rw-r--r--time/Makefile4
-rw-r--r--time/Versions3
-rw-r--r--time/strfxtime.c33
-rw-r--r--time/time.h56
4 files changed, 3 insertions, 93 deletions
diff --git a/time/Makefile b/time/Makefile
index 7e45eaa8a5..08b783fa30 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+# Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -28,7 +28,7 @@ routines := offtime asctime clock ctime ctime_r difftime \
gettimeofday settimeofday adjtime tzset \
tzfile getitimer setitimer \
stime dysize timegm ftime \
- strptime getdate strfxtime
+ strptime getdate
tests := test_time clocktest tst-posixtz tst-strptime
diff --git a/time/Versions b/time/Versions
index 24039f9630..e117a4acd4 100644
--- a/time/Versions
+++ b/time/Versions
@@ -45,8 +45,5 @@ libc {
# g*
getdate; getdate_r; getitimer;
-
- # s*
- strfxtime;
}
}
diff --git a/time/strfxtime.c b/time/strfxtime.c
deleted file mode 100644
index eb563ae52e..0000000000
--- a/time/strfxtime.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ISO C extended string formatting.
- Copyright (C) 1997 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#include <time.h>
-
-/* The ISO C 9X standard extended the `struct tm' structure to contain some
- more information necessary for the new formats. But the struct format
- we used so far already contains the information and since the `struct tm'
- and `struct tmx' structures match exactly in the first part. So we can
- simply use `strftime' to implement `strfxtime'. */
-size_t
-strfxtime (char *s, size_t maxsize, const char *format,
- const struct tmx *timeptr)
-{
- return strftime (s, maxsize, format, (const struct tm *) timeptr);
-}
diff --git a/time/time.h b/time/time.h
index 08b1da244c..234835d812 100644
--- a/time/time.h
+++ b/time/time.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,94,95,96,97,98 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -95,14 +95,6 @@ struct timespec
#undef __need_timespec
-/* Value used for `tm_' field in `struct tmx' if describing the local
- time. */
-#define _LOCALTIME (0x7fffffff)
-
-/* Value used for `tm_leapsecond' field if the number cannot be computed. */
-#define _NO_LEAP_SECONDS (0x7fffffff)
-
-
#ifdef _TIME_H
/* Used by other time functions. */
struct tm
@@ -126,35 +118,6 @@ struct tm
# endif
};
-#ifdef __USE_ISOC9X
-/* Extended form of `struct tm' defined in ISO C 9X. */
-struct tmx
-{
- int tm_sec; /* Seconds. [0-60] (1 leap second) */
- int tm_min; /* Minutes. [0-59] */
- int tm_hour; /* Hours. [0-23] */
- int tm_mday; /* Day. [1-31] */
- int tm_mon; /* Month. [0-11] */
- int tm_year; /* Year - 1900. */
- int tm_wday; /* Day of week. [0-6] */
- int tm_yday; /* Days in year.[0-365] */
- int tm_isdst; /* DST. [-1/0/1]*/
-
-# ifdef __USE_BSD
- long int tm_gmtoff; /* Seconds east of UTC. */
-# else
- long int __tm_gmtoff; /* Seconds east of UTC. */
-# endif
- __const char *__tm_zonestr; /* Timezone abbreviation. */
-
- int tm_version; /* Version number. */
- int tm_zone; /* Minutes offset from UTC [-1439-1439] */
- int tm_leapsecs; /* Number of leap seconds applied. */
- void *tm_ext; /* Extension block. */
- size_t tm_extlen; /* Size of the extension block. */
-};
-#endif
-
/* Time used by the program so far (user time + system time).
The result / CLOCKS_PER_SECOND is program time in seconds. */
@@ -170,12 +133,6 @@ extern double difftime __P ((time_t __time1, time_t __time0))
/* Return the `time_t' representation of TP and normalize TP. */
extern time_t mktime __P ((struct tm *__tp));
-#ifdef __USE_ISOC9X
-/* Return the `time_t' representation of TP and normalize TP, taking
- account for the extra members in `struct tmx'. */
-extern time_t mkxtime __P ((struct tmx *__tp));
-#endif
-
/* Format TP into S according to FORMAT.
Write no more than MAXSIZE characters and return the number
@@ -184,17 +141,6 @@ extern size_t strftime __P ((char *__restrict __s, size_t __maxsize,
__const char *__restrict __format,
__const struct tm *__restrict __tp));
-#ifdef __USE_ISOC9X
-/* Format TP into S according to FORMAT.
- Write no more than MAXSIZE characters and return the number
- of characters written, or 0 if it would exceed MAXSIZE. */
-extern size_t strfxtime __P ((char *__restrict __s, size_t __maxsize,
- __const char *__restrict __format,
- __const struct tmx *__restrict __tp));
-
-
-#endif
-
# ifdef __USE_XOPEN
/* Parse S according to FORMAT and store binary time information in TP.
The return value is a pointer to the first unparsed character in S. */