From 26721ed62e2cefdfe6f1d1603342822d6d2bf616 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 25 Sep 2003 15:34:03 +0000 Subject: Update. 2003-09-25 Jakub Jelinek * misc/syslog.c: Include locale.h. (vsyslog): Add date always in C locale %h %e %T format. --- ChangeLog | 5 +++++ misc/syslog.c | 10 ++++++---- sysdeps/i386/fpu/fclrexcpt.c | 6 +++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index dbcac80268..1668593ebb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-09-25 Jakub Jelinek + + * misc/syslog.c: Include locale.h. + (vsyslog): Add date always in C locale %h %e %T format. + 2003-09-24 Paul Eggert * argp/argp-fmtstream.c (__argp_fmtstream_ensure): Check for diff --git a/misc/syslog.c b/misc/syslog.c index d84cbbf47f..fac969ae98 100644 --- a/misc/syslog.c +++ b/misc/syslog.c @@ -48,6 +48,7 @@ static char sccsid[] = "@(#)syslog.c 8.4 (Berkeley) 3/18/94"; #include #include #include +#include #if __STDC__ #include @@ -187,10 +188,11 @@ vsyslog(pri, fmt, ap) prioff = fprintf (f, "<%d>", pri); (void) time (&now); #ifdef USE_IN_LIBIO - f->_IO_write_ptr += strftime (f->_IO_write_ptr, - f->_IO_write_end - f->_IO_write_ptr, - "%h %e %T ", - __localtime_r (&now, &now_tm)); + f->_IO_write_ptr += __strftime_l (f->_IO_write_ptr, + f->_IO_write_end - f->_IO_write_ptr, + "%h %e %T ", + __localtime_r (&now, &now_tm), + &_nl_C_locobj); #else f->__bufp += strftime (f->__bufp, f->__put_limit - f->__bufp, "%h %e %T ", __localtime_r (&now, &now_tm)); diff --git a/sysdeps/i386/fpu/fclrexcpt.c b/sysdeps/i386/fpu/fclrexcpt.c index f7ccd3acf6..0873ad9cca 100644 --- a/sysdeps/i386/fpu/fclrexcpt.c +++ b/sysdeps/i386/fpu/fclrexcpt.c @@ -1,5 +1,5 @@ /* Clear given exceptions in current floating-point environment. - Copyright (C) 1997,99,2000,01 Free Software Foundation, Inc. + Copyright (C) 1997,99,2000, 2001, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -48,10 +48,10 @@ __feclearexcept (int excepts) /* Get the current MXCSR. */ __asm__ ("stmxcsr %0" : "=m" (*&xnew_exc)); - + /* Clear the relevant bits. */ xnew_exc &= excepts ^ FE_ALL_EXCEPT; - + /* Put the new data in effect. */ __asm__ ("ldmxcsr %0" : : "m" (*&xnew_exc)); } -- cgit 1.4.1