From 9e6f796b0d2083dcc48c062853660f96db0a3c8d Mon Sep 17 00:00:00 2001 From: mike Date: Wed, 21 Aug 2002 16:20:02 +0000 Subject: o Merge and into a new header called . o will continue to live so it can define MD clock macros, which are only MD because of gratuitous differences between architectures. o Change all headers to make use of this. This mainly involves changing: #ifdef _BSD_FOO_T_ typedef _BSD_FOO_T_ foo_t; #undef _BSD_FOO_T_ #endif to: #ifndef _FOO_T_DECLARED typedef __foo_t foo_t; #define _FOO_T_DECLARED #endif Concept by: bde Reviewed by: jake, obrien --- include/stdio.h | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'include/stdio.h') diff --git a/include/stdio.h b/include/stdio.h index d64e690..724b0df 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -41,18 +41,18 @@ #define _STDIO_H_ #include -#include +#include -#ifdef _BSD_SIZE_T_ -typedef _BSD_SIZE_T_ size_t; -#undef _BSD_SIZE_T_ +#ifndef _SIZE_T_DECLARED +typedef __size_t size_t; +#define _SIZE_T_DECLARED #endif #ifndef NULL #define NULL 0 #endif -typedef _BSD_OFF_T_ fpos_t; +typedef __off_t fpos_t; #define _FSTDIO /* Define for new stdio with functions. */ @@ -251,16 +251,16 @@ FILE *tmpfile(void); char *tmpnam(char *); int ungetc(int, FILE *); int vfprintf(FILE *__restrict, const char *__restrict, - _BSD_VA_LIST_); -int vprintf(const char *__restrict, _BSD_VA_LIST_); + __va_list); +int vprintf(const char *__restrict, __va_list); int vsprintf(char *__restrict, const char *__restrict, - _BSD_VA_LIST_); + __va_list); #if __ISO_C_VISIBLE >= 1999 int snprintf(char *__restrict, size_t, const char *__restrict, ...) __printflike(3, 4); int vsnprintf(char *__restrict, size_t, const char *__restrict, - _BSD_VA_LIST_) __printflike(3, 0); + __va_list) __printflike(3, 0); #endif /* @@ -298,8 +298,8 @@ int putchar_unlocked(int); #endif #if __POSIX_VISIBLE >= 200112 -int fseeko(FILE *, _BSD_OFF_T_, int); -_BSD_OFF_T_ ftello(FILE *); +int fseeko(FILE *, __off_t, int); +__off_t ftello(FILE *); #endif #if __BSD_VISIBLE || __XSI_VISIBLE > 0 && __XSI_VISIBLE < 600 @@ -327,10 +327,10 @@ __const char *fmtcheck(const char *, const char *) __ATTR_FORMAT_ARG; int fpurge(FILE *); void setbuffer(FILE *, char *, int); int setlinebuf(FILE *); -int vasprintf(char **, const char *, _BSD_VA_LIST_) +int vasprintf(char **, const char *, __va_list) __printflike(2, 0); -int vscanf(const char *, _BSD_VA_LIST_) __scanflike(1, 0); -int vsscanf(const char *, const char *, _BSD_VA_LIST_) +int vscanf(const char *, __va_list) __scanflike(1, 0); +int vsscanf(const char *, const char *, __va_list) __scanflike(2, 0); /* @@ -364,19 +364,19 @@ FILE *funopen(const void *, */ #ifndef _FTRUNCATE_DECLARED #define _FTRUNCATE_DECLARED -int ftruncate(int, _BSD_OFF_T_); +int ftruncate(int, __off_t); #endif #ifndef _LSEEK_DECLARED #define _LSEEK_DECLARED -_BSD_OFF_T_ lseek(int, _BSD_OFF_T_, int); +__off_t lseek(int, __off_t, int); #endif #ifndef _MMAP_DECLARED #define _MMAP_DECLARED -void *mmap(void *, size_t, int, int, int, _BSD_OFF_T_); +void *mmap(void *, size_t, int, int, int, __off_t); #endif #ifndef _TRUNCATE_DECLARED #define _TRUNCATE_DECLARED -int truncate(const char *, _BSD_OFF_T_); +int truncate(const char *, __off_t); #endif #endif /* __BSD_VISIBLE */ @@ -384,8 +384,8 @@ int truncate(const char *, _BSD_OFF_T_); * Functions internal to the implementation. */ int __srget(FILE *); -int __vfscanf(FILE *, const char *, _BSD_VA_LIST_); -int __svfscanf(FILE *, const char *, _BSD_VA_LIST_); +int __vfscanf(FILE *, const char *, __va_list); +int __svfscanf(FILE *, const char *, __va_list); int __swbuf(int, FILE *); /* -- cgit v1.1