[Midnightbsd-cvs] src [10683] trunk/include: sync up

[laffer1 at midnightbsd.org]

Revision: 10683
          http://svnweb.midnightbsd.org/src/?rev=10683
Author:   laffer1
Date:     2018-06-09 15:52:58 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync up

Modified Paths:
--------------
    trunk/include/signal.h
    trunk/include/stdbool.h
    trunk/include/stdio.h

Modified: trunk/include/signal.h
===================================================================
--- trunk/include/signal.h	2018-06-09 19:52:00 UTC (rev 10682)
+++ trunk/include/signal.h	2018-06-09 19:52:58 UTC (rev 10683)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.3 (Berkeley) 3/30/94
- * $MidnightBSD$
+ * $FreeBSD: stable/10/include/signal.h 228468 2011-12-13 13:32:56Z ed $
  */
 
 #ifndef _SIGNAL_H_
@@ -42,9 +43,9 @@
  * XXX should enlarge these, if only to give empty names instead of bounds
  * errors for large signal numbers.
  */
-extern __const char *__const sys_signame[NSIG];
-extern __const char *__const sys_siglist[NSIG];
-extern __const int sys_nsig;
+extern const char * const sys_signame[NSIG];
+extern const char * const sys_siglist[NSIG];
+extern const int sys_nsig;
 #endif
 
 #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE

Modified: trunk/include/stdbool.h
===================================================================
--- trunk/include/stdbool.h	2018-06-09 19:52:00 UTC (rev 10682)
+++ trunk/include/stdbool.h	2018-06-09 19:52:58 UTC (rev 10683)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 2000 Jeroen Ruigrok van der Werven <asmodai at FreeBSD.org>
  * All rights reserved.
@@ -23,12 +24,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/include/stdbool.h 228878 2011-12-25 20:15:41Z ed $
  */
 
-#ifndef _STDBOOL_H_
-#define	_STDBOOL_H_	
-
 #ifndef __bool_true_false_are_defined
 #define	__bool_true_false_are_defined	1
 
@@ -44,5 +42,3 @@
 
 #endif /* !__cplusplus */
 #endif /* __bool_true_false_are_defined */
-
-#endif /* !_STDBOOL_H_ */

Modified: trunk/include/stdio.h
===================================================================
--- trunk/include/stdio.h	2018-06-09 19:52:00 UTC (rev 10682)
+++ trunk/include/stdio.h	2018-06-09 19:52:58 UTC (rev 10683)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -30,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
- * $MidnightBSD$
+ * $FreeBSD: stable/10/include/stdio.h 306846 2016-10-08 14:10:45Z vangyzen $
  */
 
 #ifndef	_STDIO_H_
@@ -144,6 +145,7 @@
 	int	_fl_count;	/* recursive lock count */
 	int	_orientation;	/* orientation for fwide() */
 	__mbstate_t _mbstate;	/* multibyte conversion state */
+	int	_flags2;	/* additional flags */
 };
 #ifndef _STDFILE_DECLARED
 #define _STDFILE_DECLARED
@@ -166,7 +168,7 @@
 #define	__SRW	0x0010		/* open for reading & writing */
 #define	__SEOF	0x0020		/* found EOF */
 #define	__SERR	0x0040		/* found error */
-#define	__SMBF	0x0080		/* _buf is from malloc */
+#define	__SMBF	0x0080		/* _bf._base is from malloc */
 #define	__SAPP	0x0100		/* fdopen()ed in append mode */
 #define	__SSTR	0x0200		/* this is an sprintf/snprintf string */
 #define	__SOPT	0x0400		/* do fseek() optimization */
@@ -176,6 +178,8 @@
 #define	__SALC	0x4000		/* allocate string space dynamically */
 #define	__SIGN	0x8000		/* ignore this file in _fwalk */
 
+#define	__S2OAP	0x0001		/* O_APPEND mode is set */
+
 /*
  * The following three definitions are for ANSI C, which took them
  * from System V, which brilliantly took internal interface macros and
@@ -343,10 +347,12 @@
 #endif
 
 #if __BSD_VISIBLE || __POSIX_VISIBLE >= 200809
+FILE	*fmemopen(void * __restrict, size_t, const char * __restrict);
 ssize_t	 getdelim(char ** __restrict, size_t * __restrict, int,
 	    FILE * __restrict);
+FILE	*open_memstream(char **, size_t *);
 int	 renameat(int, const char *, int, const char *);
-int	 vdprintf(int, const char * __restrict, __va_list);
+int	 vdprintf(int, const char * __restrict, __va_list) __printflike(2, 0);
 
 /*
  * Every programmer and his dog wrote functions called getline() and dprintf()
@@ -382,7 +388,7 @@
 #endif
 
 #ifdef _WITH_DPRINTF
-int	 (dprintf)(int, const char * __restrict, ...);
+int	 (dprintf)(int, const char * __restrict, ...) __printflike(2, 3);
 #endif
 
 #endif /* __BSD_VISIBLE || __POSIX_VISIBLE >= 200809 */
@@ -394,6 +400,7 @@
 int	 asprintf(char **, const char *, ...) __printflike(2, 3);
 char	*ctermid_r(char *);
 void	 fcloseall(void);
+int	 fdclose(FILE *, int *);
 char	*fgetln(FILE *, size_t *);
 const char *fmtcheck(const char *, const char *) __format_arg(2);
 int	 fpurge(FILE *);
@@ -407,8 +414,8 @@
  * positive errno values.  Use strerror() or strerror_r() from <string.h>
  * instead.
  */
-extern __const int sys_nerr;
-extern __const char *__const sys_errlist[];
+extern const int sys_nerr;
+extern const char * const sys_errlist[];
 
 /*
  * Stdio function-access interface.