===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/stdio.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -c -r1.31 -r1.32
*** src/include/stdio.h	2005/04/30 09:25:17	1.31
--- src/include/stdio.h	2005/05/11 18:39:19	1.32
***************
*** 1,4 ****
! /*	$OpenBSD: stdio.h,v 1.31 2005/04/30 09:25:17 espie Exp $	*/
  /*	$NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: stdio.h,v 1.32 2005/05/11 18:39:19 espie Exp $	*/
  /*	$NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $	*/
  
  /*-
***************
*** 327,342 ****
  int	 vsscanf(const char *, const char *, _BSD_VA_LIST_)
  		__attribute__((__format__ (scanf, 2, 0)))
  		__attribute__((__nonnull__ (2)));
  __END_DECLS
  
  /*
-  * This is a #define because the function is used internally and
-  * (unlike vfscanf) the name __svfscanf is guaranteed not to collide
-  * with a user function when _ANSI_SOURCE or _POSIX_SOURCE is defined.
-  */
- #define	 vfscanf	__svfscanf
- 
- /*
   * Stdio function-access interface.
   */
  __BEGIN_DECLS
--- 327,338 ----
  int	 vsscanf(const char *, const char *, _BSD_VA_LIST_)
  		__attribute__((__format__ (scanf, 2, 0)))
  		__attribute__((__nonnull__ (2)));
+ int	 vfscanf(FILE *, const char *, _BSD_VA_LIST_)
+ 		__attribute__((__format__ (scanf, 2, 0)))
+ 		__attribute__((__nonnull__ (2)));
  __END_DECLS
  
  /*
   * Stdio function-access interface.
   */
  __BEGIN_DECLS
***************
*** 355,361 ****
   */
  __BEGIN_DECLS
  int	__srget(FILE *);
- int	__svfscanf(FILE *, const char *, _BSD_VA_LIST_);
  int	__swbuf(int, FILE *);
  __END_DECLS
  
--- 351,356 ----