| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: ansi.h,v 1.25 2009/12/14 00:46:04 matt Exp $ */ | | 1 | /* $NetBSD: ansi.h,v 1.26 2009/12/14 20:42:12 matt 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. |
| @@ -41,33 +41,32 @@ | | | @@ -41,33 +41,32 @@ |
41 | * Types which are fundamental to the implementation and may appear in | | 41 | * Types which are fundamental to the implementation and may appear in |
42 | * more than one standard header are defined here. Standard headers | | 42 | * more than one standard header are defined here. Standard headers |
43 | * then use: | | 43 | * then use: |
44 | * #ifdef _BSD_SIZE_T_ | | 44 | * #ifdef _BSD_SIZE_T_ |
45 | * typedef _BSD_SIZE_T_ size_t; | | 45 | * typedef _BSD_SIZE_T_ size_t; |
46 | * #undef _BSD_SIZE_T_ | | 46 | * #undef _BSD_SIZE_T_ |
47 | * #endif | | 47 | * #endif |
48 | */ | | 48 | */ |
49 | #define _BSD_CLOCK_T_ unsigned long /* clock() */ | | 49 | #define _BSD_CLOCK_T_ unsigned long /* clock() */ |
50 | #ifndef __mips_o32 | | 50 | #ifndef __mips_o32 |
51 | #define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ | | 51 | #define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ |
52 | #define _BSD_SIZE_T_ unsigned long /* sizeof() */ | | 52 | #define _BSD_SIZE_T_ unsigned long /* sizeof() */ |
53 | #define _BSD_SSIZE_T_ long /* byte count or error */ | | 53 | #define _BSD_SSIZE_T_ long /* byte count or error */ |
54 | #define _BSD_TIME_T_ __int64_t /* time() */ | | | |
55 | #else | | 54 | #else |
56 | #define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */ | | 55 | #define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */ |
57 | #define _BSD_SIZE_T_ unsigned int /* sizeof() */ | | 56 | #define _BSD_SIZE_T_ unsigned int /* sizeof() */ |
58 | #define _BSD_SSIZE_T_ int /* byte count or error */ | | 57 | #define _BSD_SSIZE_T_ int /* byte count or error */ |
59 | #define _BSD_TIME_T_ long /* time() */ | | | |
60 | #endif /* !__mips_o32 */ | | 58 | #endif /* !__mips_o32 */ |
| | | 59 | #define _BSD_TIME_T_ __int64_t /* time() */ |
61 | #if __GNUC_PREREQ__(3, 0) | | 60 | #if __GNUC_PREREQ__(3, 0) |
62 | #define _BSD_VA_LIST_ __builtin_va_list /* GCC builtin type */ | | 61 | #define _BSD_VA_LIST_ __builtin_va_list /* GCC builtin type */ |
63 | #else | | 62 | #else |
64 | #define _BSD_VA_LIST_ char * /* va_list */ | | 63 | #define _BSD_VA_LIST_ char * /* va_list */ |
65 | #endif | | 64 | #endif |
66 | #define _BSD_CLOCKID_T_ int /* clockid_t */ | | 65 | #define _BSD_CLOCKID_T_ int /* clockid_t */ |
67 | #define _BSD_TIMER_T_ int /* timer_t */ | | 66 | #define _BSD_TIMER_T_ int /* timer_t */ |
68 | #define _BSD_SUSECONDS_T_ int /* suseconds_t */ | | 67 | #define _BSD_SUSECONDS_T_ int /* suseconds_t */ |
69 | #define _BSD_USECONDS_T_ unsigned int /* useconds_t */ | | 68 | #define _BSD_USECONDS_T_ unsigned int /* useconds_t */ |
70 | #define _BSD_WCHAR_T_ int /* wchar_t */ | | 69 | #define _BSD_WCHAR_T_ int /* wchar_t */ |
71 | #define _BSD_WINT_T_ int /* wint_t */ | | 70 | #define _BSD_WINT_T_ int /* wint_t */ |
72 | #define _BSD_WCTRANS_T_ void * /* wctrans_t */ | | 71 | #define _BSD_WCTRANS_T_ void * /* wctrans_t */ |
73 | #define _BSD_WCTYPE_T_ void * /* wctype_t */ | | 72 | #define _BSD_WCTYPE_T_ void * /* wctype_t */ |