Module Name: src
Committed By: snj
Date: Wed Mar 25 17:15:54 UTC 2015
Modified Files:
src/include [netbsd-7]: stdio.h unistd.h
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.91.2.1 src/include/stdio.h
cvs rdiff -u -r1.142.2.1 -r1.142.2.2 src/include/unistd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/stdio.h
diff -u src/include/stdio.h:1.91 src/include/stdio.h:1.91.2.1
--- src/include/stdio.h:1.91 Thu Aug 7 17:24:03 2014
+++ src/include/stdio.h Wed Mar 25 17:15:54 2015
@@ -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 @@ __END_DECLS
/*
* 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 @@ __BEGIN_DECLS
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
Index: src/include/unistd.h
diff -u src/include/unistd.h:1.142.2.1 src/include/unistd.h:1.142.2.2
--- src/include/unistd.h:1.142.2.1 Tue Feb 24 10:47:17 2015
+++ src/include/unistd.h Wed Mar 25 17:15:54 2015
@@ -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 @@ char *getwd(char *); /* obsoleted by
/*
* 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)
