diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-07-29 13:41:25 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-07-29 13:41:25 +0200 |
| commit | ac285df609a4cdd7fe09949bfe0d650a82d9942f (patch) | |
| tree | 4735e2e6ddc539475f3820d4aea955206fc8c077 /libio | |
| parent | 6bdb5f22a0ee205c45d1f465a8b39179830a14cb (diff) | |
| parent | c97164f05ba8fa5d2ebf30f1c2de083bc1ead1e1 (diff) | |
Merge commit 'origin/release/2.10/master' into fedora/2.10/master
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/.cvsignore | 8 | ||||
| -rw-r--r-- | libio/Makefile | 1 | ||||
| -rw-r--r-- | libio/fileops.c | 6 | ||||
| -rw-r--r-- | libio/tst-fgetwc.c | 2 |
4 files changed, 5 insertions, 12 deletions
diff --git a/libio/.cvsignore b/libio/.cvsignore deleted file mode 100644 index 602b74c1ae..0000000000 --- a/libio/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -*.d *.o *.so *.po *.go stamp.* *.stamp *.ustamp *.udeps -*.gz *.Z *.tar *.tgz -=* -TODO COPYING* AUTHORS copyr-* copying.* -glibc-* - -mpn-copy.mk -distinfo diff --git a/libio/Makefile b/libio/Makefile index b94d047f5a..501e80c2ee 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -153,6 +153,7 @@ tst-ungetwc2-ENV = LOCPATH=$(common-objpfx)localedata bug-ungetwc2-ENV = LOCPATH=$(common-objpfx)localedata tst-swscanf-ENV = LOCPATH=$(common-objpfx)localedata bug-ftell-ENV = LOCPATH=$(common-objpfx)localedata +tst-fgetwc-ENV = LOCPATH=$(common-objpfx)localedata generated = tst-fopenloc.mtrace tst-fopenloc.check diff --git a/libio/fileops.c b/libio/fileops.c index cf47c915a7..4698953f7a 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995, 1997-2005, 2006, 2007, 2008 +/* Copyright (C) 1993, 1995, 1997-2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Per Bothner <bothner@cygnus.com>. @@ -319,11 +319,11 @@ _IO_new_file_fopen (fp, filename, mode, is32not64) continue; case 'c': fp->_flags2 |= _IO_FLAGS2_NOTCANCEL; - break; + continue; #ifdef O_CLOEXEC case 'e': oflags |= O_CLOEXEC; - break; + continue; #endif default: /* Ignore. */ diff --git a/libio/tst-fgetwc.c b/libio/tst-fgetwc.c index 9ccfeb1526..06e4a424ff 100644 --- a/libio/tst-fgetwc.c +++ b/libio/tst-fgetwc.c @@ -6,7 +6,7 @@ static int do_test (void) { - if (setlocale (LC_ALL, "de_DE.utf8") == NULL) + if (setlocale (LC_ALL, "de_DE.UTF-8") == NULL) { puts ("setlocale failed"); return 1; |