--- libio/genops.c	7 May 2003 03:46:09 -0000	1.61
+++ libio/genops.c	8 Jan 2003 06:38:52 -0000	1.60
@@ -602,9 +602,12 @@
 INTDEF(_IO_init)
 
 void
-_IO_old_init (fp, flags)
+_IO_no_init (fp, flags, orientation, wd, jmp)
      _IO_FILE *fp;
      int flags;
+     int orientation;
+     struct _IO_wide_data *wd;
+     struct _IO_jump_t *jmp;
 {
   fp->_flags = _IO_MAGIC|flags;
   fp->_flags2 = 0;
@@ -630,17 +633,6 @@
   if (fp->_lock != NULL)
     _IO_lock_init (*fp->_lock);
 #endif
-}
-
-void
-_IO_no_init (fp, flags, orientation, wd, jmp)
-     _IO_FILE *fp;
-     int flags;
-     int orientation;
-     struct _IO_wide_data *wd;
-     struct _IO_jump_t *jmp;
-{
-  _IO_old_init (fp, flags);
   fp->_mode = orientation;
 #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
   if (orientation >= 0)
--- libio/libioP.h	7 May 2003 03:46:43 -0000	1.66
+++ libio/libioP.h	27 Mar 2003 11:53:59 -0000	1.65
@@ -479,7 +479,6 @@
 extern int _IO_old_fgetpos64 __P ((_IO_FILE *, _IO_fpos64_t *));
 extern int _IO_new_fsetpos64 __P ((_IO_FILE *, const _IO_fpos64_t *));
 extern int _IO_old_fsetpos64 __P ((_IO_FILE *, const _IO_fpos64_t *));
-extern void _IO_old_init __P ((_IO_FILE *fp, int flags));
 
 
 #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
--- libio/oldiofdopen.c	7 May 2003 03:47:43 -0000	1.8
+++ libio/oldiofdopen.c	26 Feb 2002 01:43:50 -0000	1.7
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,94,97,99,2000,2002,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1993,94,97,99,2000,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -114,7 +114,7 @@
 #ifdef _IO_MTSAFE_IO
   new_f->fp.file._lock = &new_f->lock;
 #endif
-  _IO_old_init (&new_f->fp.file, 0);
+  INTUSE(_IO_init) (&new_f->fp.file, 0);
   _IO_JUMPS (&new_f->fp) = &_IO_old_file_jumps;
   _IO_old_file_init (&new_f->fp);
 #if  !_IO_UNIFIED_JUMPTABLES
--- libio/oldiofopen.c	7 May 2003 03:47:09 -0000	1.11
+++ libio/oldiofopen.c	26 Feb 2002 01:43:50 -0000	1.10
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1997,1999,2000,2002,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -53,7 +53,7 @@
 #ifdef _IO_MTSAFE_IO
   new_f->fp.file._lock = &new_f->lock;
 #endif
-  _IO_old_init (&new_f->fp.file, 0);
+  INTUSE(_IO_init) (&new_f->fp.file, 0);
   _IO_JUMPS (&new_f->fp) = &_IO_old_file_jumps;
   _IO_old_file_init (&new_f->fp);
 #if  !_IO_UNIFIED_JUMPTABLES