From bbdef797baaddf4c85163832972fd0140cad964d Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 12 Aug 2003 18:40:03 +0000
Subject: Update.

2003-08-12  Jakub Jelinek  <jakub@redhat.com>

	* libio/libioP.h (_IO_vtable_offset): Define.
	* libio/freopen.c (freopen): Use it.
	* libio/ioputs.c (_IO_puts): Likewise.
	* libio/freopen64.c (freopen64): Likewise.
	* libio/genops.c (__underflow, __uflow, _IO_flush_all_lockp):
	Likewise.
	* libio/iofclose.c (_IO_new_fclose): Likewise.
	* libio/iofputs.c (_IO_fputs): Likewise.
	* libio/ioftell.c (_IO_ftell): Likewise.
	* libio/iofwrite.c (_IO_fwrite): Likewise.
	* libio/ioseekoff.c (_IO_seekoff_unlocked): Likewise.
	* libio/iosetbuffer.c (_IO_setbuffer): Likewise.
	* stdio-common/vfprintf.c (ORIENT, vfprintf): Likewise.
	* stdio-common/vfscanf.c (ORIENT): Likewise.
---
 libio/genops.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'libio/genops.c')

diff --git a/libio/genops.c b/libio/genops.c
index 8077268ba9..88877ad3f0 100644
--- a/libio/genops.c
+++ b/libio/genops.c
@@ -324,7 +324,7 @@ __underflow (fp)
      _IO_FILE *fp;
 {
 #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
-  if (fp->_vtable_offset == 0 && _IO_fwide (fp, -1) != -1)
+  if (_IO_vtable_offset (fp) == 0 && _IO_fwide (fp, -1) != -1)
     return EOF;
 #endif
 
@@ -357,7 +357,7 @@ __uflow (fp)
      _IO_FILE *fp;
 {
 #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
-  if (fp->_vtable_offset == 0 && _IO_fwide (fp, -1) != -1)
+  if (_IO_vtable_offset (fp) == 0 && _IO_fwide (fp, -1) != -1)
     return EOF;
 #endif
 
@@ -834,7 +834,7 @@ _IO_flush_all_lockp (int do_lock)
 
       if (((fp->_mode <= 0 && fp->_IO_write_ptr > fp->_IO_write_base)
 #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
-	   || (fp->_vtable_offset == 0
+	   || (_IO_vtable_offset (fp) == 0
 	       && fp->_mode > 0 && (fp->_wide_data->_IO_write_ptr
 				    > fp->_wide_data->_IO_write_base))
 #endif
-- 
cgit v1.2.3-65-gdbad