Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update.
	* libio/libio.h (_IO_flockfile, _IO_funlockfile): Fix typo in last
	patch (_mode -> _flags).
  • Loading branch information
Ulrich Drepper committed Sep 1, 2000
1 parent a8e58aa commit aebb1fa
Show file tree
Hide file tree
Showing 8 changed files with 83 additions and 6 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
@@ -1,5 +1,8 @@
2000-09-01 Ulrich Drepper <drepper@redhat.com>

* libio/libio.h (_IO_flockfile, _IO_funlockfile): Fix typo in last
patch (_mode -> _flags).

* libio/Makefile (headers): Add stdio_ext.h.
(routines): Add __fbufsize, __freading, __fwriting, __freadable,
__fwritable, __flbf, __fpurge, __fpending, and __fsetlocking.
Expand Down
3 changes: 2 additions & 1 deletion libio/__fpurge.c
Expand Up @@ -24,14 +24,15 @@
General Public License. */

#include <stdio_ext.h>
#include "libioP.h"

void
__fpurge (FILE *fp)
{
if (fp->_mode > 0)
{
/* Wide-char stream. */
if (_IO_in_wbackup (fp))
if (_IO_in_backup (fp))
_IO_free_wbackup_area (fp);

fp->_wide_data->_IO_read_end = fp->_wide_data->_IO_read_ptr;
Expand Down
4 changes: 2 additions & 2 deletions libio/libio.h
Expand Up @@ -443,9 +443,9 @@ extern int _IO_ftrylockfile (_IO_FILE *) __THROW;
#ifdef _IO_MTSAFE_IO
# define _IO_peekc(_fp) _IO_peekc_locked (_fp)
# define _IO_flockfile(_fp) \
if (((_fp)->_mode & _IO_USER_LOCK) == 0) _IO_flockfile (_fp)
if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_flockfile (_fp)
# define _IO_funlockfile(_fp) \
if (((_fp)->_mode & _IO_USER_LOCK) == 0) _IO_funlockfile (_fp)
if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_funlockfile (_fp)
#else
# define _IO_peekc(_fp) _IO_peekc_unlocked (_fp)
# define _IO_flockfile(_fp) /**/
Expand Down
3 changes: 3 additions & 0 deletions linuxthreads/ChangeLog
@@ -1,5 +1,8 @@
2000-09-01 Ulrich Drepper <drepper@redhat.com>

* sysdeps/pthread/bits/stdio-lock.h (_IO_cleanup_region_start):
Fix typo in last patch (_mode -> _flags).

* sysdeps/pthread/bits/stdio-lock.h (_IO_cleanup_region_start):
Provide definition which respects _IO_USER_LOCK flag.

Expand Down
2 changes: 1 addition & 1 deletion linuxthreads/sysdeps/pthread/bits/stdio-lock.h
Expand Up @@ -27,7 +27,7 @@ typedef pthread_mutex_t _IO_lock_t;

#define _IO_cleanup_region_start(_fct, _fp) \
{ struct _pthread_cleanup_buffer _buffer; \
int _avail = (((_fp)->_mode & _IO_USER_LOCK) == 0 \
int _avail = (((_fp)->_flags & _IO_USER_LOCK) == 0 \
&& _pthread_cleanup_push_defer != NULL); \
if (_avail) { \
_pthread_cleanup_push_defer (&_buffer, (_fct), (_fp)); \
Expand Down
6 changes: 6 additions & 0 deletions localedata/ChangeLog
@@ -1,3 +1,9 @@
2000-09-01 Ulrich Drepper <drepper@redhat.com>

* Makefile (test-input): Add sv_SE.ISO-8859-1.
(LOCALES): Likewise.
* sv_SE.ISO-8859-1: New file.

2000-08-31 Ulrich Drepper <drepper@redhat.com>

* locales/zh_HK: Correct d_t_fmt and t_fmt_ampm.
Expand Down
4 changes: 2 additions & 2 deletions localedata/Makefile
Expand Up @@ -45,7 +45,7 @@ test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch tst-trans \
tst-mbswcs1 tst-mbswcs2 tst-mbswcs3 tst-mbswcs4 tst-mbswcs5 \
tst-ctype tst-wctype tst-langinfo
test-input := de_DE.ISO-8859-1 en_US.ISO-8859-1 da_DK.ISO-8859-1 \
hr_HR.ISO-8859-2
hr_HR.ISO-8859-2 sv_SE.ISO-8859-1
test-input-data = $(addsuffix .in, $(basename $(test-input)))
test-output := $(foreach s, .out .xout, \
$(addsuffix $s, $(basename $(test-input))))
Expand Down Expand Up @@ -120,7 +120,7 @@ ifeq (no,$(cross-compiling))
# We have to generate locales
LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \
en_US.ISO-8859-1 ja_JP.EUC-JP da_DK.ISO-8859-1 \
hr_HR.ISO-8859-2
hr_HR.ISO-8859-2 sv_SE.ISO-8859-1
LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g')
CHARMAPS := $(shell echo "$(LOCALES)"|sed 's/[^ .]*[.]\([^ ]*\)/\1/g')
CTYPE_FILES = $(addsuffix /LC_CTYPE,$(LOCALES))
Expand Down
64 changes: 64 additions & 0 deletions localedata/sv_SE.in
@@ -0,0 +1,64 @@
a
A
b
B
c
C
d
D
e
E
f
F
g
G
h
H
i
I
j
J
k
K
l
L
m
M
n
N
o
O
p
P
q
Q
r
R
s
S
t
T
u
U
v
w
V
W
x
X
y
Y
z
Z

0 comments on commit aebb1fa

Please sign in to comment.