Module Name: src Committed By: kamil Date: Tue May 7 03:49:28 UTC 2019
Modified Files: src/sys/arch/alpha/include: ansi.h src/sys/arch/amd64/include: ansi.h src/sys/arch/amiga/include: ansi.h src/sys/arch/arm/include: ansi.h src/sys/arch/atari/include: ansi.h src/sys/arch/dreamcast/include: ansi.h src/sys/arch/evbsh3/include: ansi.h src/sys/arch/hp300/include: ansi.h src/sys/arch/hpcsh/include: ansi.h src/sys/arch/hppa/include: ansi.h src/sys/arch/i386/include: ansi.h src/sys/arch/landisk/include: ansi.h src/sys/arch/luna68k/include: ansi.h src/sys/arch/m68k/include: ansi.h src/sys/arch/mips/include: ansi.h src/sys/arch/mvme68k/include: ansi.h src/sys/arch/news68k/include: ansi.h src/sys/arch/powerpc/include: ansi.h src/sys/arch/sh3/include: ansi.h src/sys/arch/sparc/include: ansi.h src/sys/arch/sparc64/include: ansi.h src/sys/arch/usermode/include: ansi.h src/sys/arch/vax/include: ansi.h src/sys/arch/x68k/include: ansi.h Log Message: Switch all users (except ia64) of custom machine/ansi.h to common_ansi.h Deduplicate the code among ports and poll definitions of types directly from a compiler. This fixes miscompilation of certain programs that instruct compilers to generate code for different types. This bug has been detected with -fshort-wchar in EFI firmware. Proposed and discussed on a mailing list (twice). Itanium uses custom !ELF fallback switch, temporarily leave it as it is. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/alpha/include/ansi.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/amd64/include/ansi.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amiga/include/ansi.h cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/include/ansi.h cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/arch/atari/include/ansi.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/dreamcast/include/ansi.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbsh3/include/ansi.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hp300/include/ansi.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hpcsh/include/ansi.h cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hppa/include/ansi.h cvs rdiff -u -r1.27 -r1.28 src/sys/arch/i386/include/ansi.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/landisk/include/ansi.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/include/ansi.h cvs rdiff -u -r1.24 -r1.25 src/sys/arch/m68k/include/ansi.h cvs rdiff -u -r1.29 -r1.30 src/sys/arch/mips/include/ansi.h cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/arch/mvme68k/include/ansi.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/news68k/include/ansi.h cvs rdiff -u -r1.30 -r1.31 src/sys/arch/powerpc/include/ansi.h cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sh3/include/ansi.h cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sparc/include/ansi.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sparc64/include/ansi.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/usermode/include/ansi.h cvs rdiff -u -r1.26 -r1.27 src/sys/arch/vax/include/ansi.h cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/arch/x68k/include/ansi.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/alpha/include/ansi.h diff -u src/sys/arch/alpha/include/ansi.h:1.25 src/sys/arch/alpha/include/ansi.h:1.26 --- src/sys/arch/alpha/include/ansi.h:1.25 Wed Jun 17 14:02:47 2015 +++ src/sys/arch/alpha/include/ansi.h Tue May 7 03:49:25 2019 @@ -1,62 +1,3 @@ -/* $NetBSD: ansi.h,v 1.25 2015/06/17 14:02:47 martin Exp $ */ +/* $NetBSD: ansi.h,v 1.26 2019/05/07 03:49:25 kamil Exp $ */ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - */ - -#ifndef _ANSI_H_ -#define _ANSI_H_ - -#include <sys/cdefs.h> - -#include <machine/int_types.h> - -/* - * Types which are fundamental to the implementation and may appear in - * more than one standard header are defined here. Standard headers - * then use: - * #ifdef _BSD_SIZE_T_ - * typedef _BSD_SIZE_T_ size_t; - * #undef _BSD_SIZE_T_ - * #endif - */ -#define _BSD_CLOCK_T_ unsigned int /* clock() */ -#define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ -#define _BSD_SIZE_T_ unsigned long /* sizeof() */ -#define _BSD_SSIZE_T_ long /* byte count or error */ -#define _BSD_TIME_T_ __int64_t /* time() */ -#define _BSD_CLOCKID_T_ int /* clockid_t */ -#define _BSD_TIMER_T_ int /* timer_t */ -#define _BSD_SUSECONDS_T_ int /* suseconds_t */ -#define _BSD_USECONDS_T_ unsigned int /* useconds_t */ -#define _BSD_WCHAR_T_ int /* wchar_t */ -#define _BSD_WINT_T_ int /* wint_t */ - -#endif /* _ANSI_H_ */ +#include <sys/common_ansi.h> Index: src/sys/arch/amd64/include/ansi.h diff -u src/sys/arch/amd64/include/ansi.h:1.10 src/sys/arch/amd64/include/ansi.h:1.11 --- src/sys/arch/amd64/include/ansi.h:1.10 Sun Jul 17 20:54:36 2011 +++ src/sys/arch/amd64/include/ansi.h Tue May 7 03:49:26 2019 @@ -1,70 +1,3 @@ -/* $NetBSD: ansi.h,v 1.10 2011/07/17 20:54:36 joerg Exp $ */ +/* $NetBSD: ansi.h,v 1.11 2019/05/07 03:49:26 kamil Exp $ */ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - */ - -#ifndef _X86_64_ANSI_H_ -#define _X86_64_ANSI_H_ - -#ifdef __x86_64__ - -#include <sys/cdefs.h> - -#include <machine/int_types.h> - -/* - * Types which are fundamental to the implementation and may appear in - * more than one standard header are defined here. Standard headers - * then use: - * #ifdef _BSD_SIZE_T_ - * typedef _BSD_SIZE_T_ size_t; - * #undef _BSD_SIZE_T_ - * #endif - */ -#define _BSD_CLOCK_T_ unsigned int /* clock() */ -#define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ -#define _BSD_SIZE_T_ unsigned long /* sizeof() */ -#define _BSD_SSIZE_T_ long /* byte count or error */ -#define _BSD_TIME_T_ __int64_t /* time() */ -#define _BSD_CLOCKID_T_ int /* clockid_t */ -#define _BSD_TIMER_T_ int /* timer_t */ -#define _BSD_SUSECONDS_T_ int /* suseconds_t */ -#define _BSD_USECONDS_T_ unsigned int /* useconds_t */ -#define _BSD_WCHAR_T_ int /* wchar_t */ -#define _BSD_WINT_T_ int /* wint_t */ - -#else /* !__x86_64__ */ - -#include <i386/ansi.h> - -#endif /* __x86_64__ */ - -#endif /* _X86_64_ANSI_H_ */ +#include <sys/common_ansi.h> Index: src/sys/arch/amiga/include/ansi.h diff -u src/sys/arch/amiga/include/ansi.h:1.8 src/sys/arch/amiga/include/ansi.h:1.9 --- src/sys/arch/amiga/include/ansi.h:1.8 Wed Oct 26 02:05:55 1994 +++ src/sys/arch/amiga/include/ansi.h Tue May 7 03:49:26 2019 @@ -1,8 +1,3 @@ -/* $NetBSD: ansi.h,v 1.8 1994/10/26 02:05:55 cgd Exp $ */ - -#ifndef _MACHINE_ANSI_H_ -#define _MACHINE_ANSI_H_ +/* $NetBSD: ansi.h,v 1.9 2019/05/07 03:49:26 kamil Exp $ */ #include <m68k/ansi.h> - -#endif Index: src/sys/arch/arm/include/ansi.h diff -u src/sys/arch/arm/include/ansi.h:1.17 src/sys/arch/arm/include/ansi.h:1.18 --- src/sys/arch/arm/include/ansi.h:1.17 Mon Feb 24 16:57:57 2014 +++ src/sys/arch/arm/include/ansi.h Tue May 7 03:49:26 2019 @@ -1,79 +1,3 @@ -/* $NetBSD: ansi.h,v 1.17 2014/02/24 16:57:57 christos Exp $ */ +/* $NetBSD: ansi.h,v 1.18 2019/05/07 03:49:26 kamil Exp $ */ -/* - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: @(#)ansi.h 8.2 (Berkeley) 1/4/94 - */ - -#ifndef _ARM_ANSI_H_ -#define _ARM_ANSI_H_ - -#include <sys/cdefs.h> - -#include <machine/int_types.h> - -/* - * Types which are fundamental to the implementation and may appear in - * more than one standard header are defined here. Standard headers - * then use: - * #ifdef _BSD_SIZE_T_ - * typedef _BSD_SIZE_T_ size_t; - * #undef _BSD_SIZE_T_ - * #endif - */ -#define _BSD_CLOCK_T_ unsigned int /* clock() */ -#ifdef __PTRDIFF_TYPE__ -#define _BSD_PTRDIFF_T_ __PTRDIFF_TYPE__ /* ptr1 - ptr2 */ -#define _BSD_SSIZE_T_ __PTRDIFF_TYPE__ /* byte count or error */ -#else -#define _BSD_PTRDIFF_T_ long int /* ptr1 - ptr2 */ -#define _BSD_SSIZE_T_ long int /* byte count or error */ -#endif -#ifdef __SIZE_TYPE__ -#define _BSD_SIZE_T_ __SIZE_TYPE__ /* sizeof() */ -#else -#define _BSD_SIZE_T_ unsigned long int /* sizeof() */ -#endif -#define _BSD_TIME_T_ __int64_t /* time() */ -#define _BSD_CLOCKID_T_ int /* clockid_t */ -#define _BSD_TIMER_T_ int /* timer_t */ -#define _BSD_SUSECONDS_T_ int /* suseconds_t */ -#define _BSD_USECONDS_T_ unsigned int /* useconds_t */ -#ifdef __WCHAR_TYPE__ -#define _BSD_WCHAR_T_ __WCHAR_TYPE__ /* wchar_t */ -#else -#define _BSD_WCHAR_T_ int /* wchar_t */ -#endif -#ifdef __WINT_TYPE__ -#define _BSD_WINT_T_ __WINT_TYPE__ /* wint_t */ -#else -#define _BSD_WINT_T_ int /* wint_t */ -#endif - -#endif /* _ARM_ANSI_H_ */ +#include <sys/common_ansi.h> Index: src/sys/arch/atari/include/ansi.h diff -u src/sys/arch/atari/include/ansi.h:1.1.1.1 src/sys/arch/atari/include/ansi.h:1.2 --- src/sys/arch/atari/include/ansi.h:1.1.1.1 Sun Mar 26 07:12:09 1995 +++ src/sys/arch/atari/include/ansi.h Tue May 7 03:49:26 2019 @@ -1,8 +1,3 @@ -/* $NetBSD: ansi.h,v 1.1.1.1 1995/03/26 07:12:09 leo Exp $ */ - -#ifndef _MACHINE_ANSI_H_ -#define _MACHINE_ANSI_H_ +/* $NetBSD: ansi.h,v 1.2 2019/05/07 03:49:26 kamil Exp $ */ #include <m68k/ansi.h> - -#endif Index: src/sys/arch/dreamcast/include/ansi.h diff -u src/sys/arch/dreamcast/include/ansi.h:1.1 src/sys/arch/dreamcast/include/ansi.h:1.2 --- src/sys/arch/dreamcast/include/ansi.h:1.1 Mon Dec 11 18:19:13 2000 +++ src/sys/arch/dreamcast/include/ansi.h Tue May 7 03:49:26 2019 @@ -1,7 +1,3 @@ -/* $NetBSD: ansi.h,v 1.1 2000/12/11 18:19:13 marcus Exp $ */ -#ifndef _DREAMCAST_ANSI_H_ -#define _DREAMCAST_ANSI_H_ +/* $NetBSD: ansi.h,v 1.2 2019/05/07 03:49:26 kamil Exp $ */ #include <sh3/ansi.h> - -#endif /* _DREAMCAST_ANSI_H_ */ Index: src/sys/arch/evbsh3/include/ansi.h diff -u src/sys/arch/evbsh3/include/ansi.h:1.1 src/sys/arch/evbsh3/include/ansi.h:1.2 --- src/sys/arch/evbsh3/include/ansi.h:1.1 Mon Sep 13 10:30:27 1999 +++ src/sys/arch/evbsh3/include/ansi.h Tue May 7 03:49:26 2019 @@ -1,7 +1,3 @@ -/* $NetBSD: ansi.h,v 1.1 1999/09/13 10:30:27 itojun Exp $ */ -#ifndef _EVBSH3_ANSI_H_ -#define _EVBSH3_ANSI_H_ +/* $NetBSD: ansi.h,v 1.2 2019/05/07 03:49:26 kamil Exp $ */ #include <sh3/ansi.h> - -#endif /* _EVBSH3_ANSI_H_ */ Index: src/sys/arch/hp300/include/ansi.h diff -u src/sys/arch/hp300/include/ansi.h:1.4 src/sys/arch/hp300/include/ansi.h:1.5 --- src/sys/arch/hp300/include/ansi.h:1.4 Wed Oct 26 07:26:16 1994 +++ src/sys/arch/hp300/include/ansi.h Tue May 7 03:49:26 2019 @@ -1,4 +1,3 @@ -/* $NetBSD: ansi.h,v 1.4 1994/10/26 07:26:16 cgd Exp $ */ +/* $NetBSD: ansi.h,v 1.5 2019/05/07 03:49:26 kamil Exp $ */ -/* Just use the common m68k definition */ #include <m68k/ansi.h> Index: src/sys/arch/hpcsh/include/ansi.h diff -u src/sys/arch/hpcsh/include/ansi.h:1.2 src/sys/arch/hpcsh/include/ansi.h:1.3 --- src/sys/arch/hpcsh/include/ansi.h:1.2 Sun Jan 28 03:31:30 2001 +++ src/sys/arch/hpcsh/include/ansi.h Tue May 7 03:49:26 2019 @@ -1,7 +1,3 @@ -/* $NetBSD: ansi.h,v 1.2 2001/01/28 03:31:30 uch Exp $ */ -#ifndef _HPCSH_ANSI_H_ -#define _HPCSH_ANSI_H_ +/* $NetBSD: ansi.h,v 1.3 2019/05/07 03:49:26 kamil Exp $ */ #include <sh3/ansi.h> - -#endif /* _HPCSH_ANSI_H_ */ Index: src/sys/arch/hppa/include/ansi.h diff -u src/sys/arch/hppa/include/ansi.h:1.14 src/sys/arch/hppa/include/ansi.h:1.15 --- src/sys/arch/hppa/include/ansi.h:1.14 Wed Jun 17 14:32:31 2015 +++ src/sys/arch/hppa/include/ansi.h Tue May 7 03:49:26 2019 @@ -1,63 +1,3 @@ -/* $NetBSD: ansi.h,v 1.14 2015/06/17 14:32:31 martin Exp $ */ +/* $NetBSD: ansi.h,v 1.15 2019/05/07 03:49:26 kamil Exp $ */ -/* $OpenBSD: ansi.h,v 1.4 2000/02/22 17:29:12 millert Exp $ */ - -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - */ - -#ifndef _ANSI_H_ -#define _ANSI_H_ - -#include <sys/cdefs.h> -#include <machine/int_types.h> - -/* - * Types which are fundamental to the implementation and may appear in - * more than one standard header are defined here. Standard headers - * then use: - * #ifdef _BSD_SIZE_T_ - * typedef _BSD_SIZE_T_ size_t; - * #undef _BSD_SIZE_T_ - * #endif - */ -#define _BSD_CLOCK_T_ unsigned int /* clock() */ -#define _BSD_PTRDIFF_T_ long int /* ptr1 - ptr2 */ -#define _BSD_SIZE_T_ unsigned long int /* sizeof() */ -#define _BSD_SSIZE_T_ long int /* byte count or error */ -#define _BSD_TIME_T_ __int64_t /* time() */ -#define _BSD_CLOCKID_T_ int -#define _BSD_TIMER_T_ int -#define _BSD_SUSECONDS_T_ int /* suseconds_t */ -#define _BSD_USECONDS_T_ unsigned int /* useconds_t */ -#define _BSD_WCHAR_T_ int /* wchar_t */ -#define _BSD_WINT_T_ int /* wint_t */ - -#endif /* _ANSI_H_ */ +#include <sys/common_ansi.h> Index: src/sys/arch/i386/include/ansi.h diff -u src/sys/arch/i386/include/ansi.h:1.27 src/sys/arch/i386/include/ansi.h:1.28 --- src/sys/arch/i386/include/ansi.h:1.27 Wed Jun 17 14:32:31 2015 +++ src/sys/arch/i386/include/ansi.h Tue May 7 03:49:26 2019 @@ -1,71 +1,3 @@ -/* $NetBSD: ansi.h,v 1.27 2015/06/17 14:32:31 martin Exp $ */ +/* $NetBSD: ansi.h,v 1.28 2019/05/07 03:49:26 kamil Exp $ */ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - */ - -#ifndef _I386_ANSI_H_ -#define _I386_ANSI_H_ - -#include <sys/cdefs.h> - -#include <machine/int_types.h> - -/* - * Types which are fundamental to the implementation and may appear in - * more than one standard header are defined here. Standard headers - * then use: - * #ifdef _BSD_SIZE_T_ - * typedef _BSD_SIZE_T_ size_t; - * #undef _BSD_SIZE_T_ - * #endif - */ -#define _BSD_CLOCK_T_ unsigned int /* clock() */ -#define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */ -#define _BSD_SIZE_T_ unsigned int /* sizeof() */ -#define _BSD_SSIZE_T_ int /* byte count or error */ -#define _BSD_TIME_T_ __int64_t /* time() */ -#define _BSD_CLOCKID_T_ int /* clockid_t */ -#define _BSD_TIMER_T_ int /* timer_t */ -#define _BSD_SUSECONDS_T_ int /* suseconds_t */ -#define _BSD_USECONDS_T_ unsigned int /* useconds_t */ - -#if defined(__WCHAR_TYPE__) -#define _BSD_WCHAR_T_ __WCHAR_TYPE__ /* wchar_t */ -#else -#define _BSD_WCHAR_T_ int /* wchar_t */ -#endif -#if defined(__WINT_TYPE__) -#define _BSD_WINT_T_ __WINT_TYPE__ /* wint_t */ -#else -#define _BSD_WINT_T_ int /* wint_t */ -#endif - -#endif /* _I386_ANSI_H_ */ +#include <sys/common_ansi.h> Index: src/sys/arch/landisk/include/ansi.h diff -u src/sys/arch/landisk/include/ansi.h:1.1 src/sys/arch/landisk/include/ansi.h:1.2 --- src/sys/arch/landisk/include/ansi.h:1.1 Fri Sep 1 21:26:18 2006 +++ src/sys/arch/landisk/include/ansi.h Tue May 7 03:49:27 2019 @@ -1,8 +1,3 @@ -/* $NetBSD: ansi.h,v 1.1 2006/09/01 21:26:18 uwe Exp $ */ - -#ifndef _LANDISK_ANSI_H_ -#define _LANDISK_ANSI_H_ +/* $NetBSD: ansi.h,v 1.2 2019/05/07 03:49:27 kamil Exp $ */ #include <sh3/ansi.h> - -#endif /* _LANDISK_ANSI_H_ */ Index: src/sys/arch/luna68k/include/ansi.h diff -u src/sys/arch/luna68k/include/ansi.h:1.1 src/sys/arch/luna68k/include/ansi.h:1.2 --- src/sys/arch/luna68k/include/ansi.h:1.1 Wed Jan 5 08:48:56 2000 +++ src/sys/arch/luna68k/include/ansi.h Tue May 7 03:49:27 2019 @@ -1,4 +1,3 @@ -/* $NetBSD: ansi.h,v 1.1 2000/01/05 08:48:56 nisimura Exp $ */ +/* $NetBSD: ansi.h,v 1.2 2019/05/07 03:49:27 kamil Exp $ */ -/* Just use the common m68k definition */ #include <m68k/ansi.h> Index: src/sys/arch/m68k/include/ansi.h diff -u src/sys/arch/m68k/include/ansi.h:1.24 src/sys/arch/m68k/include/ansi.h:1.25 --- src/sys/arch/m68k/include/ansi.h:1.24 Wed Jun 17 14:32:31 2015 +++ src/sys/arch/m68k/include/ansi.h Tue May 7 03:49:27 2019 @@ -1,61 +1,3 @@ -/* $NetBSD: ansi.h,v 1.24 2015/06/17 14:32:31 martin Exp $ */ +/* $NetBSD: ansi.h,v 1.25 2019/05/07 03:49:27 kamil Exp $ */ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - */ - -#ifndef _ANSI_H_ -#define _ANSI_H_ - -#include <sys/cdefs.h> -#include <machine/int_types.h> - -/* - * Types which are fundamental to the implementation and may appear in - * more than one standard header are defined here. Standard headers - * then use: - * #ifdef _BSD_SIZE_T_ - * typedef _BSD_SIZE_T_ size_t; - * #undef _BSD_SIZE_T_ - * #endif - */ -#define _BSD_CLOCK_T_ unsigned int /* clock() */ -#define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */ -#define _BSD_SIZE_T_ unsigned int /* sizeof() */ -#define _BSD_SSIZE_T_ int /* byte count or error */ -#define _BSD_TIME_T_ __int64_t /* time() */ -#define _BSD_CLOCKID_T_ int /* clockid_t */ -#define _BSD_TIMER_T_ int /* timer_t */ -#define _BSD_SUSECONDS_T_ int /* suseconds_t */ -#define _BSD_USECONDS_T_ unsigned int /* useconds_t */ -#define _BSD_WCHAR_T_ int /* wchar_t */ -#define _BSD_WINT_T_ int /* wint_t */ - -#endif /* _ANSI_H_ */ +#include <sys/common_ansi.h> Index: src/sys/arch/mips/include/ansi.h diff -u src/sys/arch/mips/include/ansi.h:1.29 src/sys/arch/mips/include/ansi.h:1.30 --- src/sys/arch/mips/include/ansi.h:1.29 Wed Jun 17 13:52:51 2015 +++ src/sys/arch/mips/include/ansi.h Tue May 7 03:49:27 2019 @@ -1,67 +1,3 @@ -/* $NetBSD: ansi.h,v 1.29 2015/06/17 13:52:51 matt Exp $ */ +/* $NetBSD: ansi.h,v 1.30 2019/05/07 03:49:27 kamil Exp $ */ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - */ - -#ifndef _ANSI_H_ -#define _ANSI_H_ - -#include <sys/cdefs.h> -#include <machine/int_types.h> - -/* - * Types which are fundamental to the implementation and may appear in - * more than one standard header are defined here. Standard headers - * then use: - * #ifdef _BSD_SIZE_T_ - * typedef _BSD_SIZE_T_ size_t; - * #undef _BSD_SIZE_T_ - * #endif - */ -#define _BSD_CLOCK_T_ unsigned int /* clock() */ -#ifndef __mips_o32 -#define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ -#define _BSD_SIZE_T_ unsigned long /* sizeof() */ -#define _BSD_SSIZE_T_ long /* byte count or error */ -#else -#define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */ -#define _BSD_SIZE_T_ unsigned int /* sizeof() */ -#define _BSD_SSIZE_T_ int /* byte count or error */ -#endif /* !__mips_o32 */ -#define _BSD_TIME_T_ __int64_t /* time() */ -#define _BSD_CLOCKID_T_ int /* clockid_t */ -#define _BSD_TIMER_T_ int /* timer_t */ -#define _BSD_SUSECONDS_T_ int /* suseconds_t */ -#define _BSD_USECONDS_T_ unsigned int /* useconds_t */ -#define _BSD_WCHAR_T_ int /* wchar_t */ -#define _BSD_WINT_T_ int /* wint_t */ - -#endif /* _ANSI_H_ */ +#include <sys/common_ansi.h> Index: src/sys/arch/mvme68k/include/ansi.h diff -u src/sys/arch/mvme68k/include/ansi.h:1.1.1.1 src/sys/arch/mvme68k/include/ansi.h:1.2 --- src/sys/arch/mvme68k/include/ansi.h:1.1.1.1 Tue Jul 25 23:12:12 1995 +++ src/sys/arch/mvme68k/include/ansi.h Tue May 7 03:49:27 2019 @@ -1,4 +1,3 @@ -/* $NetBSD: ansi.h,v 1.1.1.1 1995/07/25 23:12:12 chuck Exp $ */ +/* $NetBSD: ansi.h,v 1.2 2019/05/07 03:49:27 kamil Exp $ */ -/* Just use the common m68k definition */ #include <m68k/ansi.h> Index: src/sys/arch/news68k/include/ansi.h diff -u src/sys/arch/news68k/include/ansi.h:1.1 src/sys/arch/news68k/include/ansi.h:1.2 --- src/sys/arch/news68k/include/ansi.h:1.1 Thu Dec 9 14:53:07 1999 +++ src/sys/arch/news68k/include/ansi.h Tue May 7 03:49:27 2019 @@ -1,4 +1,3 @@ -/* $NetBSD: ansi.h,v 1.1 1999/12/09 14:53:07 tsutsui Exp $ */ +/* $NetBSD: ansi.h,v 1.2 2019/05/07 03:49:27 kamil Exp $ */ -/* Just use the common m68k definition */ #include <m68k/ansi.h> Index: src/sys/arch/powerpc/include/ansi.h diff -u src/sys/arch/powerpc/include/ansi.h:1.30 src/sys/arch/powerpc/include/ansi.h:1.31 --- src/sys/arch/powerpc/include/ansi.h:1.30 Wed Jun 17 13:52:51 2015 +++ src/sys/arch/powerpc/include/ansi.h Tue May 7 03:49:27 2019 @@ -1,67 +1,3 @@ -/* $NetBSD: ansi.h,v 1.30 2015/06/17 13:52:51 matt Exp $ */ +/* $NetBSD: ansi.h,v 1.31 2019/05/07 03:49:27 kamil Exp $ */ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - */ - -#ifndef _ANSI_H_ -#define _ANSI_H_ - -#include <sys/cdefs.h> -#include <machine/int_types.h> - -/* - * Types which are fundamental to the implementation and may appear in - * more than one standard header are defined here. Standard headers - * then use: - * #ifdef _BSD_SIZE_T_ - * typedef _BSD_SIZE_T_ size_t; - * #undef _BSD_SIZE_T_ - * #endif - */ -#define _BSD_CLOCK_T_ unsigned int /* clock() */ -#ifdef _LP64 -#define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ -#define _BSD_SIZE_T_ unsigned long /* sizeof() */ -#define _BSD_SSIZE_T_ long /* byte count or error */ -#else -#define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */ -#define _BSD_SIZE_T_ unsigned int /* sizeof() */ -#define _BSD_SSIZE_T_ int /* byte count or error */ -#endif -#define _BSD_TIME_T_ __int64_t /* time() */ -#define _BSD_CLOCKID_T_ int /* clockid_t */ -#define _BSD_TIMER_T_ int /* timer_t */ -#define _BSD_SUSECONDS_T_ int /* suseconds_t */ -#define _BSD_USECONDS_T_ unsigned int /* useconds_t */ -#define _BSD_WCHAR_T_ int /* wchar_t */ -#define _BSD_WINT_T_ int /* wint_t */ - -#endif /* _ANSI_H_ */ +#include <sys/common_ansi.h> Index: src/sys/arch/sh3/include/ansi.h diff -u src/sys/arch/sh3/include/ansi.h:1.16 src/sys/arch/sh3/include/ansi.h:1.17 --- src/sys/arch/sh3/include/ansi.h:1.16 Wed Jun 17 14:32:31 2015 +++ src/sys/arch/sh3/include/ansi.h Tue May 7 03:49:27 2019 @@ -1,60 +1,3 @@ -/* $NetBSD: ansi.h,v 1.16 2015/06/17 14:32:31 martin Exp $ */ +/* $NetBSD: ansi.h,v 1.17 2019/05/07 03:49:27 kamil Exp $ */ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - */ - -#ifndef _ANSI_H_ -#define _ANSI_H_ - -#include <machine/int_types.h> - -/* - * Types which are fundamental to the implementation and may appear in - * more than one standard header are defined here. Standard headers - * then use: - * #ifdef _BSD_SIZE_T_ - * typedef _BSD_SIZE_T_ size_t; - * #undef _BSD_SIZE_T_ - * #endif - */ -#define _BSD_CLOCK_T_ unsigned int /* clock() */ -#define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */ -#define _BSD_SIZE_T_ unsigned int /* sizeof() */ -#define _BSD_SSIZE_T_ int /* byte count or error */ -#define _BSD_TIME_T_ __int64_t /* time() */ -#define _BSD_CLOCKID_T_ int /* clockid_t */ -#define _BSD_TIMER_T_ int /* timer_t */ -#define _BSD_SUSECONDS_T_ int /* suseconds_t */ -#define _BSD_USECONDS_T_ unsigned int /* useconds_t */ -#define _BSD_WCHAR_T_ int /* wchar_t */ -#define _BSD_WINT_T_ int /* wint_t */ - -#endif /* _ANSI_H_ */ +#include <sys/common_ansi.h> Index: src/sys/arch/sparc/include/ansi.h diff -u src/sys/arch/sparc/include/ansi.h:1.24 src/sys/arch/sparc/include/ansi.h:1.25 --- src/sys/arch/sparc/include/ansi.h:1.24 Wed Jun 17 14:32:32 2015 +++ src/sys/arch/sparc/include/ansi.h Tue May 7 03:49:27 2019 @@ -1,61 +1,3 @@ -/* $NetBSD: ansi.h,v 1.24 2015/06/17 14:32:32 martin Exp $ */ +/* $NetBSD: ansi.h,v 1.25 2019/05/07 03:49:27 kamil Exp $ */ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - */ - -#ifndef _ANSI_H_ -#define _ANSI_H_ - -#include <sys/cdefs.h> -#include <machine/int_types.h> - -/* - * Types which are fundamental to the implementation and may appear in - * more than one standard header are defined here. Standard headers - * then use: - * #ifdef _BSD_SIZE_T_ - * typedef _BSD_SIZE_T_ size_t; - * #undef _BSD_SIZE_T_ - * #endif - */ -#define _BSD_CLOCK_T_ unsigned int /* clock() */ -#define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ -#define _BSD_SIZE_T_ unsigned long /* sizeof() */ -#define _BSD_SSIZE_T_ long /* byte count or error */ -#define _BSD_TIME_T_ __int64_t /* time() */ -#define _BSD_CLOCKID_T_ int /* clockid_t */ -#define _BSD_TIMER_T_ int /* timer_t */ -#define _BSD_SUSECONDS_T_ int /* suseconds_t */ -#define _BSD_USECONDS_T_ unsigned int /* useconds_t */ -#define _BSD_WCHAR_T_ int /* wchar_t */ -#define _BSD_WINT_T_ int /* wint_t */ - -#endif /* _ANSI_H_ */ +#include <sys/common_ansi.h> Index: src/sys/arch/sparc64/include/ansi.h diff -u src/sys/arch/sparc64/include/ansi.h:1.18 src/sys/arch/sparc64/include/ansi.h:1.19 --- src/sys/arch/sparc64/include/ansi.h:1.18 Wed Jun 17 14:02:47 2015 +++ src/sys/arch/sparc64/include/ansi.h Tue May 7 03:49:27 2019 @@ -1,61 +1,3 @@ -/* $NetBSD: ansi.h,v 1.18 2015/06/17 14:02:47 martin Exp $ */ +/* $NetBSD: ansi.h,v 1.19 2019/05/07 03:49:27 kamil Exp $ */ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - */ - -#ifndef _ANSI_H_ -#define _ANSI_H_ - -#include <sys/cdefs.h> -#include <machine/int_types.h> - -/* - * Types which are fundamental to the implementation and may appear in - * more than one standard header are defined here. Standard headers - * then use: - * #ifdef _BSD_SIZE_T_ - * typedef _BSD_SIZE_T_ size_t; - * #undef _BSD_SIZE_T_ - * #endif - */ -#define _BSD_CLOCK_T_ unsigned int /* clock() */ -#define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ -#define _BSD_SIZE_T_ unsigned long /* sizeof() */ -#define _BSD_SSIZE_T_ long /* byte count or error */ -#define _BSD_TIME_T_ __int64_t /* time() */ -#define _BSD_CLOCKID_T_ int /* clockid_t */ -#define _BSD_TIMER_T_ int /* timer_t */ -#define _BSD_SUSECONDS_T_ int /* suseconds_t */ -#define _BSD_USECONDS_T_ unsigned int /* useconds_t */ -#define _BSD_WCHAR_T_ int /* wchar_t */ -#define _BSD_WINT_T_ int /* wint_t */ - -#endif /* _ANSI_H_ */ +#include <sys/common_ansi.h> Index: src/sys/arch/usermode/include/ansi.h diff -u src/sys/arch/usermode/include/ansi.h:1.5 src/sys/arch/usermode/include/ansi.h:1.6 --- src/sys/arch/usermode/include/ansi.h:1.5 Wed Jun 17 14:32:32 2015 +++ src/sys/arch/usermode/include/ansi.h Tue May 7 03:49:28 2019 @@ -1,60 +1,3 @@ -/* $NetBSD: ansi.h,v 1.5 2015/06/17 14:32:32 martin Exp $ */ +/* $NetBSD: ansi.h,v 1.6 2019/05/07 03:49:28 kamil Exp $ */ -/*- - * Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca> - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _ARCH_USERMODE_INCLUDE_ANSI_H -#define _ARCH_USERMODE_INCLUDE_ANSI_H - -#include <sys/cdefs.h> -#include <machine/int_types.h> - -#define _BSD_CLOCK_T_ unsigned int -#define _BSD_TIME_T_ __int64_t -#define _BSD_CLOCKID_T_ int -#define _BSD_TIMER_T_ int -#define _BSD_SUSECONDS_T_ int -#define _BSD_USECONDS_T_ unsigned int -#define _BSD_WCHAR_T_ int -#define _BSD_WINT_T_ int - -#if defined(__i386__) -#define _BSD_PTRDIFF_T_ int -#define _BSD_SIZE_T_ unsigned int -#define _BSD_SSIZE_T_ int -#elif defined(__x86_64__) -#define _BSD_PTRDIFF_T_ long -#define _BSD_SIZE_T_ unsigned long -#define _BSD_SSIZE_T_ long -#elif defined(__arm__) -#define _BSD_PTRDIFF_T_ long int -#define _BSD_SIZE_T_ unsigned long int -#define _BSD_SSIZE_T_ long int -#else -#error "platform not supported" -#endif - -#endif /* !_ARCH_USERMODE_INCLUDE_ANSI_H */ +#include <sys/common_ansi.h> Index: src/sys/arch/vax/include/ansi.h diff -u src/sys/arch/vax/include/ansi.h:1.26 src/sys/arch/vax/include/ansi.h:1.27 --- src/sys/arch/vax/include/ansi.h:1.26 Sun Jul 17 20:54:49 2011 +++ src/sys/arch/vax/include/ansi.h Tue May 7 03:49:28 2019 @@ -1,64 +1,3 @@ -/* $NetBSD: ansi.h,v 1.26 2011/07/17 20:54:49 joerg Exp $ */ +/* $NetBSD: ansi.h,v 1.27 2019/05/07 03:49:28 kamil Exp $ */ -/*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ansi.h 7.1 (Berkeley) 3/9/91 - */ - -#ifndef _ANSI_H_ -#define _ANSI_H_ - -#include <sys/cdefs.h> -#include <machine/int_types.h> - -/* - * Types which are fundamental to the implementation and may appear in - * more than one standard header are defined here. Standard headers - * then use: - * #ifdef _SIZE_T_ - * typedef _SIZE_T_ size_t; - * #undef _SIZE_T_ - * #endif - * - * Thanks, ANSI! - */ -#define _BSD_CLOCK_T_ unsigned int /* clock() */ -#define _BSD_PTRDIFF_T_ long int /* ptr1 - ptr2 */ -#define _BSD_SIZE_T_ unsigned long int /* sizeof() */ -#define _BSD_SSIZE_T_ long int /* byte count or error */ -#define _BSD_TIME_T_ __int64_t /* time() */ -#define _BSD_WINT_T_ int /* wint_t */ -#define _BSD_CLOCKID_T_ int /* clockid_t */ -#define _BSD_TIMER_T_ int /* timer_t */ -#define _BSD_SUSECONDS_T_ int /* suseconds_t */ -#define _BSD_USECONDS_T_ unsigned int /* useconds_t */ -#define _BSD_WCHAR_T_ int /* wchar_t */ -#define _BSD_WINT_T_ int /* wint_t */ - -#endif /* _ANSI_H_ */ +#include <sys/common_ansi.h> Index: src/sys/arch/x68k/include/ansi.h diff -u src/sys/arch/x68k/include/ansi.h:1.1.1.1 src/sys/arch/x68k/include/ansi.h:1.2 --- src/sys/arch/x68k/include/ansi.h:1.1.1.1 Sun May 5 12:17:03 1996 +++ src/sys/arch/x68k/include/ansi.h Tue May 7 03:49:28 2019 @@ -1,4 +1,3 @@ -/* $NetBSD: ansi.h,v 1.1.1.1 1996/05/05 12:17:03 oki Exp $ */ +/* $NetBSD: ansi.h,v 1.2 2019/05/07 03:49:28 kamil Exp $ */ -/* Just use the common m68k definition */ #include <m68k/ansi.h>