Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/include/stdio.h,v
rcsdiff: /ftp/cvs/cvsroot/src/include/stdio.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.58.2.3
retrieving revision 1.59
diff -u -p -r1.58.2.3 -r1.59
--- src/include/stdio.h	2005/05/28 13:51:31	1.58.2.3
+++ src/include/stdio.h	2005/05/25 16:01:24	1.59
@@ -1,4 +1,4 @@
-/*	$NetBSD: stdio.h,v 1.58.2.3 2005/05/28 13:51:31 tron Exp $	*/
+/*	$NetBSD: stdio.h,v 1.59 2005/05/25 16:01:24 kleink Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,9 +37,10 @@
 #ifndef	_STDIO_H_
 #define	_STDIO_H_
 
+#include <sys/ansi.h>
+
 #include <sys/cdefs.h>
 #include <sys/featuretest.h>
-#include <sys/ansi.h>
 
 #include <machine/ansi.h>
 #ifdef	_BSD_SIZE_T_
@@ -313,29 +314,17 @@ __END_DECLS
 #endif
 
 /*
- * Functions defined in ISO XPG4.2, ISO C99, POSIX 1003.1-2001 or later.
- */
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
-    !defined(_XOPEN_SOURCE) || \
-    ((__STDC_VERSION__ - 0) >= 199901L) || \
-    ((_POSIX_C_SOURCE - 0) >= 200112L) || \
-    (defined(_XOPEN_SOURCE) && defined(_XOPEN_SOURCE_EXTENDED)) || \
-    ((_XOPEN_SOURCE - 0) >= 500) || \
-    defined(_ISOC99_SOURCE) || defined(_NETBSD_SOURCE)
-int	 snprintf(char * __restrict, size_t, const char * __restrict, ...)
-	    __attribute__((__format__(__printf__, 3, 4)));
-int	 vsnprintf(char * __restrict, size_t, const char * __restrict,
-	    _BSD_VA_LIST_)
-	    __attribute__((__format__(__printf__, 3, 0)));
-#endif
-
-/*
  * Functions defined in XPG4.2.
  */
 #if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
 __BEGIN_DECLS
 int	 getw(FILE *);
 int	 putw(int, FILE *);
+int	 snprintf(char * __restrict, size_t, const char * __restrict, ...)
+	    __attribute__((__format__(__printf__, 3, 4)));
+int	 vsnprintf(char * __restrict, size_t, const char * __restrict,
+	    _BSD_VA_LIST_)
+	    __attribute__((__format__(__printf__, 3, 0)));
 
 #ifndef __AUDIT__
 char	*tempnam(const char *, const char *);