From a5a0310d8e9d7176bb17e91c916272006a871016 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 30 Sep 1997 17:10:40 +0000 Subject: Update. 1997-09-30 18:03 Ulrich Drepper * Makerules: Undo last change. * csu/Makefile: Define before-compile at the right place. * aclocal.m4: Remove a.out file created by assembler test. * set-init.c: Find set-hooks.h using <...>. Update to db 2.3.10. * db2/Makefile: Update. * db2/db.h: Likewise. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_close.c: Likewise. * db2/btree/bt_conv.c: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.c: Likewise. * db2/btree/btree.src: Likewise. * db2/btree/btree_auto.c: Likewise. * db2/clib/getlong.c: Likewise. * db2/db/db.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db/db_conv.c: Likewise. * db2/db/db_pr.c: Likewise. * db2/db/db_ret.c: Likewise. * db2/db/db_thread.c: Likewise. * db2/hash/hash.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/hash/hash_conv.c: Likewise. * db2/hash/hash_dup.c: Likewise. * db2/hash/hash_func.c: Likewise. * db2/hash/hash_page.c: Likewise. * db2/hash/hash_rec.c: Likewise. * db2/include/btree.h: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_185.h.src: Likewise. * db2/include/db_cxx.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/db_page.h: Likewise. * db2/include/db_shash.h: Likewise. * db2/include/lock.h: Likewise. * db2/include/log.h: Likewise. * db2/include/log_ext.h: Likewise. * db2/include/mp.h: Likewise. * db2/include/shqueue.h: Likewise. * db2/include/txn.h: Likewise. * db2/lock/lock.c: Likewise. * db2/lock/lock_deadlock.c: Likewise. * db2/log/log.c: Likewise. * db2/log/log_archive.c: Likewise. * db2/log/log_auto.c: Likewise. * db2/log/log_get.c: Likewise. * db2/log/log_put.c: Likewise. * db2/log/log_register.c: Likewise. * db2/mp/mp_bh.c: Likewise. * db2/mp/mp_fget.c: Likewise. * db2/mp/mp_fopen.c: Likewise. * db2/mp/mp_fput.c: Likewise. * db2/mp/mp_fset.c: Likewise. * db2/mp/mp_open.c: Likewise. * db2/mutex/mutex.c: Likewise. * db2/os/db_os_dir.c: Likewise. * db2/progs/db_checkpoint/db_checkpoint.c: Likewise. * db2/progs/db_deadlock/db_deadlock.c: Likewise. * db2/progs/db_dump185/db_dump185.c: Likewise. * db2/progs/db_load/db_load.c: Likewise. * db2/progs/db_recover/db_recover.c: Likewise. * db2/txn/txn.c: Likewise. * db2/txn/txn_auto.c: Likewise. * elf/link.h: Define struct libname_list outside struct link_map to not confuse C++ compilers. * include/features.h: Recognize _XOPEN_SOURCE == 500 and set __USE_UNIX98. * manual/creature.texi: Explain this. * libc.map: Add new functions. * libio/Makefile (routines): Add fseeko and ftello. * libio/ftello.c: New file. * libio/fseeko.c: New file. * libio/stdio.h: Add prototypes for new functions. * manual/stdio.texi: Document fseeko and ftello. * posix/Makefile (routines): Add pread and pwrite. * sysdeps/posix/pread.c: New file. * sysdeps/posix/pwrite.c: New file. * sysdeps/stub/pread.c: New file. * sysdeps/stub/pwrite.c: New file. * posix/unistd.h: Add prototypes for pread and pwrite. Pretty print header. Define gid_t, uid_t, off_t, pid_t if __USE_UNIX98. Declare ctermid and cuserid if __USE_UNIX98. (swab): Change to take void * arguments. * string/swab.c: Change parameter to void *. * posix/sys/types: Define gid_t, uid_t, off_t, pid_t only if not already happened. * manual/llio.texi: Document pread and pwrite. * string/strings.h: Don't simply include string.h. Define BSD functions according to Unix98. * stdlib/tst-strtol.c: Include not . * sunrpc/clnt_simp.c: Likewise. * malloc/Makefile (aux): Add set-freeres. * malloc/mtrace.c: Define function release_libc_mem which calls the __libc_subfreeres handler. (mtrace): Register release_libc_mem. * malloc/set-freeres.c: New file. * intl/dcgettext.c: Define free_mem function and add to __libc_subfreeres list. * intl/finddomain.c: Likewise. * intl/gettextP.h (struct loaded_domain): Add new fields use_mmap and mmap_size. Add prototype for _nl_unloaded_domain. * intl/loadmsgcat.c: Define new function _nl_unload_domain. (_nl_load_domain): Store informaiton about mmap use and file size. * intl/localealias.c (read_alias_file): Optimize locale alias file reading by avoid frequen mallocs. Define free_mem function and add to __libc_subfreeres list. * locale/localeinfo.h: Make a difference between MAX_USAGE_COUNT and undeletable. Add prototype for _nl_unload_locale. * locale/C-collate: Mark data as undeletable by using UNDELETABLE. * locale/C-ctype: Likewise. * locale/C-messages: Likewise. * locale/C-monetary: Likewise. * locale/C-numeric: Likewise. * locale/C-time: Likewise. * locale/findlocale.c (_nl_find_locale, _nl_remove_locale): Handle MAX_USAGE_COUNT and UNDELETABLE. (free_mem): New function. Add it to __libc_subfreeres list. * locale/loadlocale.c: Define _nl_unload_locale function. * misc/hsearch.c: Register hdestroy in __libc_subfreeres list. * stdlib/fmtmsg.c (addseverity): Handle illegal severity arguments correctly Define free_mem function and add to __libc_subfreeres list. * locale/programs/localedef.c (options): short form os verbose is v. Reported by Andreas Jaeger. * misc/sys/select.h: Define pselect only is __USE_POSIX since this header is used in some others as well for historical reasons. * resolv/resolv.h: Include to make self-contained. * string/bits/string2.h: Add missing braces and optimize strcmp a bit more. * sysdeps/i386/i486/bits/string.h: Likewise. * sunrpc/rpc/auth_des.h: Include rpc/auth.h to be self-contained. Pretty print. * sysdeps/mach/hurd/cthreads.c: Add copyright text. * sysdeps/unix/sysv/linux/syscalls.list: Correct prctl entry. * sysdeps/unix/sysv/linux/sys/mman.h: Get definition of size_t. * time/time.h: Pretty print. 1997-09-29 Paul Eggert * time/strftime.c: Synchronize with GNU Emacs strftime.c. (HAVE_MEMCPY): Define if emacs is defined and HAVE_BCOPY isn't. (gmtime_r, localtime_r): Undef before defining. (iso_week_days): Use __inline__, not inline. 1997-09-27 Andreas Schwab * sysdeps/m68k/fpu/bits/mathinline.h: Rename exp2{,l,f} to __ieee754_exp2{,l,f}. * sysdeps/m68k/fpu/s_exp2.c: Likewise. * sysdeps/m68k/fpu/s_exp2l.c: Likewise. * sysdeps/m68k/fpu/s_exp2f.c: Likewise. 1997-09-27 Andreas Schwab * elf/soinit.c (__EH_FRAME_BEGIN__): Don't make the .eh_frame section read-only, it contains relocations. * elf/sofini.c (__FRAME_END__): Likewise. 1997-09-29 03:08 Ulrich Drepper * sysdeps/i386/i486/bits/string.h [__PIC__] (__strspn_cg, __strcspn_cg, __strpbrk_cg, __strstr_cg): Optimize even more. No spill register needed. Patch by NIIBE Yutaka . 1997-09-28 08:27 Thorsten Kukuk * nis/nis_call.c (__do_niscall2): Fix return code, add missing break in switch case. * nis/nis_mkdir.c: Fix return codes to match Solaris version. * nis/nis_rmdir.c: Likewise. * nis/rpcsvc/yp_prot.h: Rename struct keydat to struct keydat_t for C++. 1997-09-28 04:32 Ulrich Drepper * configure.in: Fix typo. Patch by Zack Weinberg . 1997-09-25 20:14 Philip Blundell * sysdeps/unix/sysv/linux/scsi/sg.h: New file. * sysdeps/unix/sysv/linux/Makefile: Install . --- time/strftime.c | 8 +++++- time/time.h | 89 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 51 insertions(+), 46 deletions(-) (limited to 'time') diff --git a/time/strftime.c b/time/strftime.c index 4ecbc5a..1da36e1 100644 --- a/time/strftime.c +++ b/time/strftime.c @@ -34,6 +34,10 @@ # include "../locale/localeinfo.h" #endif +#if defined emacs && !defined HAVE_BCOPY +# define HAVE_MEMCPY 1 +#endif + #include #include /* Some systems define `time_t' here. */ @@ -138,6 +142,7 @@ extern char *tzname[]; # if ! HAVE_LOCALTIME_R # if ! HAVE_TM_GMTOFF /* Approximate gmtime_r as best we can in its absence. */ +# undef gmtime_r # define gmtime_r my_gmtime_r static struct tm *gmtime_r __P ((const time_t *, struct tm *)); static struct tm * @@ -154,6 +159,7 @@ gmtime_r (t, tp) # endif /* ! HAVE_TM_GMTOFF */ /* Approximate localtime_r as best we can in its absence. */ +# undef localtime_r # define localtime_r my_ftime_localtime_r static struct tm *localtime_r __P ((const time_t *, struct tm *)); static struct tm * @@ -327,7 +333,7 @@ tm_diff (a, b) #define YDAY_MINIMUM (-366) static int iso_week_days __P ((int, int)); #ifdef __GNUC__ -inline +__inline__ #endif static int iso_week_days (yday, wday) diff --git a/time/time.h b/time/time.h index d062ba1..184f4ed 100644 --- a/time/time.h +++ b/time/time.h @@ -22,10 +22,10 @@ #ifndef _TIME_H -#if (! defined __need_time_t && !defined __need_clock_t && \ - ! defined __need_timespec) -#define _TIME_H 1 -#include +#if (! defined __need_time_t && !defined __need_clock_t && \ + ! defined __need_timespec) +# define _TIME_H 1 +# include __BEGIN_DECLS @@ -33,9 +33,9 @@ __BEGIN_DECLS #ifdef _TIME_H /* Get size_t and NULL from . */ -#define __need_size_t -#define __need_NULL -#include +# define __need_size_t +# define __need_NULL +# include #endif /* included. */ @@ -44,22 +44,22 @@ __BEGIN_DECLS /* This defines CLOCKS_PER_SEC, which is the number of processor clock ticks per second. */ -#include +# include /* This is the obsolete POSIX.1-1988 name for the same constant. */ -#ifdef __USE_POSIX -#ifndef CLK_TCK -#define CLK_TCK CLOCKS_PER_SEC -#endif -#endif +# ifdef __USE_POSIX +# ifndef CLK_TCK +# define CLK_TCK CLOCKS_PER_SEC +# endif +# endif #endif /* included. */ #if !defined __clock_t_defined && (defined _TIME_H || defined __need_clock_t) -#define __clock_t_defined 1 +# define __clock_t_defined 1 -#include +# include /* Returned by `clock'. */ typedef __clock_t clock_t; @@ -68,9 +68,9 @@ typedef __clock_t clock_t; #undef __need_clock_t #if !defined __time_t_defined && (defined _TIME_H || defined __need_time_t) -#define __time_t_defined 1 +# define __time_t_defined 1 -#include +# include /* Returned by `time'. */ typedef __time_t time_t; @@ -79,10 +79,9 @@ typedef __time_t time_t; #undef __need_time_t -#if ! defined __timespec_defined && \ - ((defined _TIME_H && defined __USE_POSIX) || \ - defined __need_timespec) -#define __timespec_defined 1 +#if !defined __timespec_defined && \ + ((defined _TIME_H && defined __USE_POSIX) || defined __need_timespec) +# define __timespec_defined 1 /* POSIX.4 structure for a time value. This is like a `struct timeval' but has nanoseconds instead of microseconds. */ @@ -111,13 +110,13 @@ struct tm int tm_yday; /* Days in year.[0-365] */ int tm_isdst; /* DST. [-1/0/1]*/ -#ifdef __USE_BSD +# ifdef __USE_BSD long int tm_gmtoff; /* Seconds east of UTC. */ __const char *tm_zone; /* Timezone abbreviation. */ -#else +# else long int __tm_gmtoff; /* Seconds east of UTC. */ __const char *__tm_zone; /* Timezone abbreviation. */ -#endif +# endif }; #endif /* included. */ @@ -154,12 +153,12 @@ extern size_t strftime __P ((char *__restrict __s, size_t __maxsize, __const char *__restrict __format, __const struct tm *__restrict __tp)); -#ifdef __USE_XOPEN +# 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. */ extern char *strptime __P ((__const char *__s, __const char *__fmt, struct tm *__tp)); -#endif +# endif /* Return the `struct tm' representation of *TIMER @@ -170,7 +169,7 @@ extern struct tm *gmtime __P ((__const time_t *__timer)); of *TIMER in the local timezone. */ extern struct tm *localtime __P ((__const time_t *__timer)); -#if defined __USE_POSIX || defined __USE_MISC +# if defined __USE_POSIX || defined __USE_MISC /* Return the `struct tm' representation of *TIMER in UTC, using *TP to store the result. */ extern struct tm *__gmtime_r __P ((__const time_t *__timer, @@ -184,7 +183,7 @@ extern struct tm *__localtime_r __P ((__const time_t *__timer, struct tm *__tp)); extern struct tm *localtime_r __P ((__const time_t *__timer, struct tm *__tp)); -#endif /* POSIX or misc */ +# endif /* POSIX or misc */ /* Compute the `struct tm' representation of *T, offset OFFSET seconds east of UTC, @@ -200,7 +199,7 @@ extern char *asctime __P ((__const struct tm *__tp)); /* Equivalent to `asctime (localtime (timer))'. */ extern char *ctime __P ((__const time_t *__timer)); -#if defined __USE_POSIX || defined __USE_MISC +# if defined __USE_POSIX || defined __USE_MISC /* Reentrant versions of the above functions. */ /* Return in BUF a string of the form "Day Mon dd hh:mm:ss yyyy\n" @@ -210,7 +209,7 @@ extern char *asctime_r __P ((__const struct tm *__tp, char *__buf)); /* Equivalent to `asctime_r (localtime_r (timer, *TMP*), buf)'. */ extern char *ctime_r __P ((__const time_t *__timer, char *__buf)); -#endif /* POSIX or misc */ +# endif /* POSIX or misc */ /* Defined in localtime.c. */ @@ -222,7 +221,7 @@ extern long int __timezone; /* Seconds west of UTC. */ If TZ is not defined, a locale-dependent default is used. */ extern void __tzset __P ((void)); -#ifdef __USE_POSIX +# ifdef __USE_POSIX /* Same as above. */ extern char *tzname[2]; @@ -231,27 +230,27 @@ extern char *tzname[2]; extern long int __tzname_max __P ((void)); extern void tzset __P ((void)); -#endif +# endif -#if defined __USE_SVID || defined __USE_XOPEN +# if defined __USE_SVID || defined __USE_XOPEN extern int daylight; extern long int timezone; -#endif +# endif -#ifdef __USE_SVID +# ifdef __USE_SVID /* Set the system time to *WHEN. This call is restricted to the superuser. */ extern int stime __P ((__const time_t *__when)); -#endif +# endif /* Nonzero if YEAR is a leap year (every 4 years, except every 100th isn't, and every 400th is). */ -#define __isleap(year) \ +# define __isleap(year) \ ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0)) -#ifdef __USE_MISC +# ifdef __USE_MISC /* Miscellaneous functions many Unices inherited from the public domain localtime package. These are included only for compatibility. */ @@ -263,19 +262,19 @@ extern time_t timelocal __P ((struct tm *__tp)); /* Return the number of days in YEAR. */ extern int dysize __P ((int __year)); -#endif +# endif -#ifdef __USE_POSIX199309 +# ifdef __USE_POSIX199309 /* Pause execution for a number of nanoseconds. */ extern int __nanosleep __P ((__const struct timespec *__requested_time, struct timespec *__remaining)); extern int nanosleep __P ((__const struct timespec *__requested_time, struct timespec *__remaining)); -#endif +# endif -#ifdef __USE_XOPEN_EXTENDED +# ifdef __USE_XOPEN_EXTENDED /* Set to one of the following values to indicate an error. 1 the DATEMSK environment variable is null or undefined, 2 the template file cannot be opened for reading, @@ -294,9 +293,9 @@ extern int getdate_err; the environment variable DATEMSK are used. In case of an error `getdate_err' is set. */ extern struct tm *getdate __P ((__const char *__string)); -#endif +# endif -#ifdef __USE_GNU +# ifdef __USE_GNU /* Since `getdate' is not reentrant because of the use of `getdate_err' and the static buffer to return the result in, we provide a thread-safe variant. The functionality is the same. The result is returned in @@ -304,7 +303,7 @@ extern struct tm *getdate __P ((__const char *__string)); value is != 0 with the same values as given above for `getdate_err'. */ extern int __getdate_r __P ((__const char *__string, struct tm *__resbufp)); extern int getdate_r __P ((__const char *__string, struct tm *__resbufp)); -#endif +# endif __END_DECLS -- cgit v1.1