aboutsummaryrefslogtreecommitdiffstats
path: root/libio/libio.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-11-19 10:29:16 -0800
committerUlrich Drepper <drepper@redhat.com>2009-11-19 10:29:16 -0800
commitdf1934daa7788ca5f19d82efb02cdf9b9c495b1a (patch)
treeaee6af463b36c8c998751aaf9ba319f25b3043f0 /libio/libio.h
parent03ebadd9eaa4663f58bd3fa6fe8283f255925632 (diff)
downloadtermbaud-df1934daa7788ca5f19d82efb02cdf9b9c495b1a.tar.gz
termbaud-df1934daa7788ca5f19d82efb02cdf9b9c495b1a.tar.xz
termbaud-df1934daa7788ca5f19d82efb02cdf9b9c495b1a.zip
Fix getwc* and putwc* on non-wide streams.
Diffstat (limited to 'libio/libio.h')
-rw-r--r--libio/libio.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/libio/libio.h b/libio/libio.h
index 643812f72ba..3c9f2bd3e84 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