Sun Jan 4 19:23:36 2009 UTC ()
revert all but time_t


(christos)
diff -r1.12.18.2 -r1.12.18.3 src/sys/arch/sh3/include/ansi.h
cvs diff -r1.12.18.2 -r1.12.18.3 src/sys/arch/sh3/include/ansi.h (switch to unified diff)

--- src/sys/arch/sh3/include/ansi.h 2008/03/30 21:02:00 1.12.18.2
+++ src/sys/arch/sh3/include/ansi.h 2009/01/04 19:23:36 1.12.18.3
@@ -1,77 +1,77 @@ @@ -1,77 +1,77 @@
1/* $NetBSD: ansi.h,v 1.12.18.2 2008/03/30 21:02:00 christos Exp $ */ 1/* $NetBSD: ansi.h,v 1.12.18.3 2009/01/04 19:23:36 christos Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1990, 1993 4 * Copyright (c) 1990, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 3. Neither the name of the University nor the names of its contributors 15 * 3. Neither the name of the University nor the names of its contributors
16 * may be used to endorse or promote products derived from this software 16 * may be used to endorse or promote products derived from this software
17 * without specific prior written permission. 17 * without specific prior written permission.
18 * 18 *
19 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 19 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
20 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 20 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 21 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 22 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
23 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 23 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE. 29 * SUCH DAMAGE.
30 * 30 *
31 * @(#)ansi.h 8.2 (Berkeley) 1/4/94 31 * @(#)ansi.h 8.2 (Berkeley) 1/4/94
32 */ 32 */
33 33
34#ifndef _ANSI_H_ 34#ifndef _ANSI_H_
35#define _ANSI_H_ 35#define _ANSI_H_
36 36
37#include <machine/int_types.h> 37#include <machine/int_types.h>
38 38
39/* 39/*
40 * Types which are fundamental to the implementation and may appear in 40 * Types which are fundamental to the implementation and may appear in
41 * more than one standard header are defined here. Standard headers 41 * more than one standard header are defined here. Standard headers
42 * then use: 42 * then use:
43 * #ifdef _BSD_SIZE_T_ 43 * #ifdef _BSD_SIZE_T_
44 * typedef _BSD_SIZE_T_ size_t; 44 * typedef _BSD_SIZE_T_ size_t;
45 * #undef _BSD_SIZE_T_ 45 * #undef _BSD_SIZE_T_
46 * #endif 46 * #endif
47 */ 47 */
48#define _BSD_CLOCK_T_ unsigned long /* clock() */ 48#define _BSD_CLOCK_T_ unsigned long /* clock() */
49#define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ 49#define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */
50#define _BSD_SIZE_T_ unsigned long /* sizeof() */ 50#define _BSD_SIZE_T_ unsigned int /* sizeof() */
51#define _BSD_SSIZE_T_ long /* byte count or error */ 51#define _BSD_SSIZE_T_ int /* byte count or error */
52#define _BSD_TIME_T_ __int64_t /* time() */ 52#define _BSD_TIME_T_ __int64_t /* time() */
53#if __GNUC_PREREQ__(2, 96) 53#if __GNUC_PREREQ__(2, 96)
54#define _BSD_VA_LIST_ __builtin_va_list /* GCC built-in type */ 54#define _BSD_VA_LIST_ __builtin_va_list /* GCC built-in type */
55#else 55#else
56#define _BSD_VA_LIST_ char * /* va_list */ 56#define _BSD_VA_LIST_ char * /* va_list */
57#endif 57#endif
58#define _BSD_CLOCKID_T_ int /* clockid_t */ 58#define _BSD_CLOCKID_T_ int /* clockid_t */
59#define _BSD_TIMER_T_ int /* timer_t */ 59#define _BSD_TIMER_T_ int /* timer_t */
60#define _BSD_SUSECONDS_T_ int /* suseconds_t */ 60#define _BSD_SUSECONDS_T_ int /* suseconds_t */
61#define _BSD_USECONDS_T_ unsigned int /* useconds_t */ 61#define _BSD_USECONDS_T_ unsigned int /* useconds_t */
62#define _BSD_WCHAR_T_ int /* wchar_t */ 62#define _BSD_WCHAR_T_ int /* wchar_t */
63#define _BSD_WINT_T_ int /* wint_t */ 63#define _BSD_WINT_T_ int /* wint_t */
64#define _BSD_WCTRANS_T_ void * /* wctrans_t */ 64#define _BSD_WCTRANS_T_ void * /* wctrans_t */
65#define _BSD_WCTYPE_T_ void * /* wctype_t */ 65#define _BSD_WCTYPE_T_ void * /* wctype_t */
66 66
67/* 67/*
68 * mbstate_t is an opaque object to keep conversion state, during multibyte 68 * mbstate_t is an opaque object to keep conversion state, during multibyte
69 * stream conversions. The content must not be referenced by user programs. 69 * stream conversions. The content must not be referenced by user programs.
70 */ 70 */
71typedef union { 71typedef union {
72 __int64_t __mbstateL; /* for alignment */ 72 __int64_t __mbstateL; /* for alignment */
73 char __mbstate8[128]; 73 char __mbstate8[128];
74} __mbstate_t; 74} __mbstate_t;
75#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */ 75#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
76 76
77#endif /* _ANSI_H_ */ 77#endif /* _ANSI_H_ */