diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-05-26 17:46:57 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-05-26 17:46:57 +0000 |
| commit | d8d5895e420d4976fca22b9bd9e1edc3094ebf30 (patch) | |
| tree | f96c015c14ac0428150153ba98f7a681ff021931 /libc/libio/oldiopopen.c | |
| parent | 62eb53f68d92687a028f3c515489b30e3df1d979 (diff) | |
| download | eglibc2-d8d5895e420d4976fca22b9bd9e1edc3094ebf30.tar.gz | |
Merge changes between r18519 and r18730 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@18731 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/libio/oldiopopen.c')
| -rw-r--r-- | libc/libio/oldiopopen.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libc/libio/oldiopopen.c b/libc/libio/oldiopopen.c index 5d808cb61..e14961ad8 100644 --- a/libc/libio/oldiopopen.c +++ b/libc/libio/oldiopopen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2002, 2004, 2012 Free Software Foundation, Inc. +/* Copyright (C) 1998-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Per Bothner <bothner@cygnus.com>. @@ -229,7 +229,7 @@ _IO_old_popen (command, mode) #endif if (_IO_old_proc_open (fp, command, mode) != NULL) return fp; - INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) &new_f->fpx.file); + _IO_un_link ((struct _IO_FILE_plus *) &new_f->fpx.file); free (new_f); return NULL; } @@ -289,20 +289,20 @@ const struct _IO_jump_t _IO_old_proc_jumps = { JUMP_INIT(finish, _IO_old_file_finish), JUMP_INIT(overflow, _IO_old_file_overflow), JUMP_INIT(underflow, _IO_old_file_underflow), - JUMP_INIT(uflow, INTUSE(_IO_default_uflow)), - JUMP_INIT(pbackfail, INTUSE(_IO_default_pbackfail)), + JUMP_INIT(uflow, _IO_default_uflow), + JUMP_INIT(pbackfail, _IO_default_pbackfail), JUMP_INIT(xsputn, _IO_old_file_xsputn), - JUMP_INIT(xsgetn, INTUSE(_IO_default_xsgetn)), + JUMP_INIT(xsgetn, _IO_default_xsgetn), JUMP_INIT(seekoff, _IO_old_file_seekoff), JUMP_INIT(seekpos, _IO_default_seekpos), JUMP_INIT(setbuf, _IO_old_file_setbuf), JUMP_INIT(sync, _IO_old_file_sync), - JUMP_INIT(doallocate, INTUSE(_IO_file_doallocate)), - JUMP_INIT(read, INTUSE(_IO_file_read)), + JUMP_INIT(doallocate, _IO_file_doallocate), + JUMP_INIT(read, _IO_file_read), JUMP_INIT(write, _IO_old_file_write), - JUMP_INIT(seek, INTUSE(_IO_file_seek)), + JUMP_INIT(seek, _IO_file_seek), JUMP_INIT(close, _IO_old_proc_close), - JUMP_INIT(stat, INTUSE(_IO_file_stat)), + JUMP_INIT(stat, _IO_file_stat), JUMP_INIT(showmanyc, _IO_default_showmanyc), JUMP_INIT(imbue, _IO_default_imbue) }; |