Module Name: src
Committed By: msaitoh
Date: Tue Jun 3 13:55:44 UTC 2014
Modified Files:
src/include [netbsd-6]: stdio.h
Log Message:
Pull up following revision(s) (requested by kleink in ticket #1066):
src/include/stdio.h 1.89-1.90
Move declarations of getdelim() and getline() from the (incorrect) ANSI C
section to POSIX-2008. From Jarmo Jaakkola in PR standards/48788.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.80.2.1 src/include/stdio.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.80 src/include/stdio.h:1.80.2.1
--- src/include/stdio.h:1.80 Sun Jan 22 18:36:16 2012
+++ src/include/stdio.h Tue Jun 3 13:55:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: stdio.h,v 1.80 2012/01/22 18:36:16 christos Exp $ */
+/* $NetBSD: stdio.h,v 1.80.2.1 2014/06/03 13:55:44 msaitoh Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -241,9 +241,6 @@ long ftell(FILE *);
size_t fwrite(const void * __restrict, size_t, size_t, FILE * __restrict);
int getc(FILE *);
int getchar(void);
-ssize_t getdelim(char ** __restrict, size_t * __restrict, int,
- FILE * __restrict);
-ssize_t getline(char ** __restrict, size_t * __restrict, FILE * __restrict);
void perror(const char *);
int printf(const char * __restrict, ...)
__printflike(1, 2);
@@ -498,10 +495,12 @@ static __inline int __sputc(int _c, FILE
#endif /* !_ANSI_SOURCE */
#if (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE)
+__BEGIN_DECLS
int vdprintf(int, const char * __restrict, __va_list)
__printflike(2, 0);
int dprintf(int, const char * __restrict, ...)
__printflike(2, 3);
+__END_DECLS
#endif /* (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE) */
#if (_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500 || \
@@ -515,7 +514,12 @@ int dprintf(int, const char * __restric
#if (_POSIX_C_SOURCE - 0) >= 200809L || (_XOPEN_SOURCE - 0) >= 700 || \
defined(_NETBSD_SOURCE)
+__BEGIN_DECLS
FILE *fmemopen(void * __restrict, size_t, const char * __restrict);
+ssize_t getdelim(char ** __restrict, size_t * __restrict, int,
+ FILE * __restrict);
+ssize_t getline(char ** __restrict, size_t * __restrict, FILE * __restrict);
+__END_DECLS
#endif
#if _FORTIFY_SOURCE > 0
