summary refs log tree commit diff
path: root/libio/libio.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-08-25 21:45:12 +0000
committerUlrich Drepper <drepper@redhat.com>2003-08-25 21:45:12 +0000
commit1c8c5277a7045ddd3d9b2db50be7e80318b7975c (patch)
tree57e72aa4927ca26b94713e1f144d3ba84bef3308 /libio/libio.h
parent0b9225cd7ffd2a6289e780f2c4bbca04f6868ac3 (diff)
downloadglibc-1c8c5277a7045ddd3d9b2db50be7e80318b7975c.tar.gz
glibc-1c8c5277a7045ddd3d9b2db50be7e80318b7975c.tar.xz
glibc-1c8c5277a7045ddd3d9b2db50be7e80318b7975c.zip
Update.
2003-08-25  Ulrich Drepper  <drepper@redhat.com>

	* libio/libio.h (_IO_fwide): In the mode==0 optimization, don't
	use _mode if _IO_fwide_maybe_incompatible.
	* libio/iofwide.c (_IO_fwide): Move the test for mode == 0 after
	the compatibility test.
Diffstat (limited to 'libio/libio.h')
-rw-r--r--libio/libio.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libio/libio.h b/libio/libio.h
index 3c6bef9b37..11274aebb4 100644
--- a/libio/libio.h
+++ b/libio/libio.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1995, 1997-2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1995, 1997-2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Per Bothner <bothner@cygnus.com>.
 
@@ -502,7 +502,7 @@ weak_extern (_IO_stdin_used);
 	 __result = (__fp)->_mode;					      \
        }								      \
      else if (__builtin_constant_p (__mode) && (__mode) == 0)		      \
-       __result = (__fp)->_mode;					      \
+       __result = _IO_fwide_maybe_incompatible ? -1 : (__fp)->_mode;	      \
      else								      \
        __result = _IO_fwide (__fp, __result);				      \
      __result; })