[src/netbsd-7]: src/include Pull up following revision(s) (requested by wiz i...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8db3aa9ec9f9
branches:  netbsd-7
changeset: 799140:8db3aa9ec9f9
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Mar 25 17:15:54 2015 +0000

description:
Pull up following revision(s) (requested by wiz in ticket #642):
        include/stdio.h: revision 1.96
        include/unistd.h: revision 1.145
Put fseeko, ftello, pread, and pwrite in the POSIX 2001 namespace.
Ok christos, apb, martin

diffstat:

 include/stdio.h  |  6 +++---
 include/unistd.h |  7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r a558444a03e6 -r 8db3aa9ec9f9 include/stdio.h
--- a/include/stdio.h   Wed Mar 25 17:13:25 2015 +0000
+++ b/include/stdio.h   Wed Mar 25 17:15:54 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: stdio.h,v 1.91 2014/08/07 17:24:03 christos Exp $      */
+/*     $NetBSD: stdio.h,v 1.91.2.1 2015/03/25 17:15:54 snj Exp $       */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -365,7 +365,7 @@
 /*
  * X/Open CAE Specification Issue 5 Version 2
  */
-#if (_XOPEN_SOURCE - 0) >= 500 || defined(_LARGEFILE_SOURCE) || \
+#if (_POSIX_C_SOURCE - 0) >= 200112L || (_XOPEN_SOURCE - 0) >= 500 || \
     defined(_NETBSD_SOURCE)
 #ifndef        off_t
 typedef        __off_t         off_t;
@@ -376,7 +376,7 @@
 int     fseeko(FILE *, off_t, int);
 off_t   ftello(FILE *);
 __END_DECLS
-#endif /* _XOPEN_SOURCE >= 500 || _LARGEFILE_SOURCE || _NETBSD_SOURCE */
+#endif /* (_POSIX_C_SOURCE - 0) >= 200112L || _XOPEN_SOURCE >= 500 || ... */
 
 /*
  * Functions defined in ISO C99.  Still put under _NETBSD_SOURCE due to
diff -r a558444a03e6 -r 8db3aa9ec9f9 include/unistd.h
--- a/include/unistd.h  Wed Mar 25 17:13:25 2015 +0000
+++ b/include/unistd.h  Wed Mar 25 17:15:54 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: unistd.h,v 1.142.2.1 2015/02/24 10:47:17 martin Exp $  */
+/*     $NetBSD: unistd.h,v 1.142.2.2 2015/03/25 17:15:54 snj Exp $     */
 
 /*-
  * Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -294,10 +294,11 @@
 /*
  * X/Open CAE Specification Issue 5 Version 2
  */
-#if (_XOPEN_SOURCE - 0) >= 500 || defined(_NETBSD_SOURCE)
+#if (_POSIX_C_SOURCE - 0) >= 200112L || (_XOPEN_SOURCE - 0) >= 500 || \
+    defined(_NETBSD_SOURCE)
 ssize_t         pread(int, void *, size_t, off_t);
 ssize_t         pwrite(int, const void *, size_t, off_t);
-#endif
+#endif /* (_POSIX_C_SOURCE - 0) >= 200112L || ... */
 
 /*
  * X/Open Extended API set 2 (a.k.a. C063)