diff options
author | Andreas Schwab <schwab@redhat.com> | 2009-11-30 14:53:29 +0100 |
---|---|---|
committer | Andreas Schwab <schwab@redhat.com> | 2009-11-30 14:54:41 +0100 |
commit | 488fb43a499982e99915c78bb70f04357ac37463 (patch) | |
tree | e356d0f1d327ed3de4a9d5abec1edf346070aa32 /libio | |
parent | eab709096f23a4511adfc547450a83008eae5fb2 (diff) | |
parent | 20af204581e1ba42738c1bfb69cc2f5350f4ffa4 (diff) |
Merge branch 'release/2.11/master' into fedora/2.11/master
Diffstat (limited to 'libio')
-rw-r--r-- | libio/libio.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libio/libio.h b/libio/libio.h index 643812f72b..3c9f2bd3e8 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1995,1997-2006,2007 Free Software Foundation, Inc. +/* Copyright (C) 1991-1995,1997-2006,2007,2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Per Bothner <bothner@cygnus.com>. @@ -442,13 +442,15 @@ extern _IO_wint_t __woverflow (_IO_FILE *, _IO_wint_t); #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T # define _IO_getwc_unlocked(_fp) \ - (_IO_BE ((_fp)->_wide_data->_IO_read_ptr >= (_fp)->_wide_data->_IO_read_end,\ - 0) \ + (_IO_BE ((_fp)->_wide_data == NULL \ + || ((_fp)->_wide_data->_IO_read_ptr \ + >= (_fp)->_wide_data->_IO_read_end), 0) \ ? __wuflow (_fp) : (_IO_wint_t) *(_fp)->_wide_data->_IO_read_ptr++) # define _IO_putwc_unlocked(_wch, _fp) \ - (_IO_BE ((_fp)->_wide_data->_IO_write_ptr \ - >= (_fp)->_wide_data->_IO_write_end, 0) \ - ? __woverflow (_fp, _wch) \ + (_IO_BE ((_fp)->_wide_data == NULL \ + || ((_fp)->_wide_data->_IO_write_ptr \ + >= (_fp)->_wide_data->_IO_write_end), 0) \ + ? __woverflow (_fp, _wch) \ : (_IO_wint_t) (*(_fp)->_wide_data->_IO_write_ptr++ = (_wch))) #endif |