diff options
Diffstat (limited to 'sys/i386/include/ansi.h')
| -rw-r--r-- | sys/i386/include/ansi.h | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/sys/i386/include/ansi.h b/sys/i386/include/ansi.h index 1665aadef1dc..0ef060a3b5bb 100644 --- a/sys/i386/include/ansi.h +++ b/sys/i386/include/ansi.h @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * 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 @@ -30,8 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)ansi.h 7.1 (Berkeley) 3/9/91 - * $Id: ansi.h,v 1.2 1993/10/16 14:39:05 rgrimes Exp $ + * @(#)ansi.h 8.2 (Berkeley) 1/4/94 */ #ifndef _ANSI_H_ @@ -41,18 +40,17 @@ * 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_ + * #ifdef _BSD_SIZE_T_ + * typedef _BSD_SIZE_T_ size_t; + * #undef _BSD_SIZE_T_ * #endif - * - * Thanks, ANSI! */ -#define _CLOCK_T_ unsigned long /* clock() */ -#define _PTRDIFF_T_ int /* ptr1 - ptr2 */ -#define _SIZE_T_ unsigned int /* sizeof() */ -#define _TIME_T_ long /* time() */ -#define _VA_LIST_ char * /* va_list */ +#define _BSD_CLOCK_T_ unsigned long /* 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_ long /* time() */ +#define _BSD_VA_LIST_ char * /* va_list */ /* * Runes (wchar_t) is declared to be an ``int'' instead of the more natural @@ -63,13 +61,12 @@ * chosen over a long is that the is*() and to*() routines take ints (says * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you * lose a bit of ANSI conformance, but your programs will still work. - * + * * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains * defined for ctype.h. */ -#define _BSD_WCHAR_T_ int /* wchar_t */ -#define _BSD_RUNE_T_ int /* rune_t */ - +#define _BSD_WCHAR_T_ int /* wchar_t */ +#define _BSD_RUNE_T_ int /* rune_t */ #endif /* _ANSI_H_ */ |