From 7ea113633e51579f6bbd3f03ab350fc8f8d0424f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 4 Nov 2003 09:58:57 +0000 Subject: Update. 2003-10-27 Daniel Jacobowitz * libio/libioP.h [_IO_USE_OLD_IO_FILE] (struct _IO_FILE_complete_plus): New type. * libio/oldiofopen.c (_IO_old_fopen): Use _IO_FILE_complete_plus. * libio/oldiofdopen.c (_IO_old_fdopen): Likewise. * libio/oldiopopen.c (struct _IO_proc_file, _IO_old_popen): Likewise. Call _IO_old_init instead of _IO_init. --- libio/oldiofopen.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libio/oldiofopen.c') diff --git a/libio/oldiofopen.c b/libio/oldiofopen.c index 29c0a18a21..0370c762f6 100644 --- a/libio/oldiofopen.c +++ b/libio/oldiofopen.c @@ -42,7 +42,7 @@ _IO_old_fopen (filename, mode) { struct locked_FILE { - struct _IO_FILE_plus fp; + struct _IO_FILE_complete_plus fp; #ifdef _IO_MTSAFE_IO _IO_lock_t lock; #endif @@ -51,17 +51,17 @@ _IO_old_fopen (filename, mode) if (new_f == NULL) return NULL; #ifdef _IO_MTSAFE_IO - new_f->fp.file._lock = &new_f->lock; + new_f->fp.file._file._lock = &new_f->lock; #endif - _IO_old_init (&new_f->fp.file, 0); - _IO_JUMPS (&new_f->fp) = &_IO_old_file_jumps; - _IO_old_file_init (&new_f->fp); + _IO_old_init (&new_f->fp.file._file, 0); + _IO_JUMPS ((struct _IO_FILE_plus *) &new_f->fp) = &_IO_old_file_jumps; + _IO_old_file_init ((struct _IO_FILE_plus *) &new_f->fp); #if !_IO_UNIFIED_JUMPTABLES new_f->fp.vtable = NULL; #endif if (_IO_old_file_fopen ((_IO_FILE *) &new_f->fp, filename, mode) != NULL) return (_IO_FILE *) &new_f->fp; - INTUSE(_IO_un_link) (&new_f->fp); + INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) &new_f->fp); free (new_f); return NULL; } -- cgit v1.2.3