Update.

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

8 files changed, 83 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 33d87a6799..3154ab2169 100644
--- a/ChangeLog
+++ b/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.
diff --git a/libio/__fpurge.c b/libio/__fpurge.c
index dd83d9f520..2956385cbe 100644
--- a/libio/__fpurge.c
+++ b/libio/__fpurge.c
@@ -24,6 +24,7 @@
    General Public License.  */
 
 #include <stdio_ext.h>
+#include "libioP.h"
 
 void
 __fpurge (FILE *fp)
@@ -31,7 +32,7 @@ __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;
diff --git a/libio/libio.h b/libio/libio.h
index 770cb6d2b3..12826ffe11 100644
--- a/libio/libio.h
+++ b/libio/libio.h
@@ -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) /**/
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 6c88108c4d..55a4702c13 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,6 +1,9 @@
 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.
 
 2000-08-30  Ulrich Drepper  <drepper@redhat.com>
diff --git a/linuxthreads/sysdeps/pthread/bits/stdio-lock.h b/linuxthreads/sysdeps/pthread/bits/stdio-lock.h
index ba3e781928..42c219624f 100644
--- a/linuxthreads/sysdeps/pthread/bits/stdio-lock.h
+++ b/linuxthreads/sysdeps/pthread/bits/stdio-lock.h
@@ -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));		      \
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 2d13840000..1e4afbbbca 100644
--- a/localedata/ChangeLog
+++ b/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.
diff --git a/localedata/Makefile b/localedata/Makefile
index 0002d0968d..f86584ab26 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -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))))
@@ -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))
diff --git a/localedata/sv_SE.in b/localedata/sv_SE.in
new file mode 100644
index 0000000000..6463e5e444
--- /dev/null
+++ b/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
+å
+Å
+ä
+Ä
+æ
+Æ
+ö
+Ö
+ø
+Ø