diff options
author | mike <mike@FreeBSD.org> | 2002-08-21 16:20:02 +0000 |
---|---|---|
committer | mike <mike@FreeBSD.org> | 2002-08-21 16:20:02 +0000 |
commit | 9e6f796b0d2083dcc48c062853660f96db0a3c8d (patch) | |
tree | 7e9e16e835d265de592c113ee6c5d85f9be039cb /lib/libc | |
parent | d5203d1ff8cef07eff72ad400fde5c759623752e (diff) | |
download | FreeBSD-src-9e6f796b0d2083dcc48c062853660f96db0a3c8d.zip FreeBSD-src-9e6f796b0d2083dcc48c062853660f96db0a3c8d.tar.gz |
o Merge <machine/ansi.h> and <machine/types.h> into a new header
called <machine/_types.h>.
o <machine/ansi.h> 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
Diffstat (limited to 'lib/libc')
-rw-r--r-- | lib/libc/locale/runetype.c | 2 | ||||
-rw-r--r-- | lib/libc/locale/tolower.c | 4 | ||||
-rw-r--r-- | lib/libc/locale/toupper.c | 4 | ||||
-rw-r--r-- | lib/libc/stdio/local.h | 2 | ||||
-rw-r--r-- | lib/libc/stdio/vasprintf.c | 2 | ||||
-rw-r--r-- | lib/libc/stdio/vprintf.c | 2 | ||||
-rw-r--r-- | lib/libc/stdio/vscanf.c | 2 | ||||
-rw-r--r-- | lib/libc/stdio/vsnprintf.c | 2 | ||||
-rw-r--r-- | lib/libc/stdio/vsprintf.c | 2 | ||||
-rw-r--r-- | lib/libc/stdio/vsscanf.c | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/lib/libc/locale/runetype.c b/lib/libc/locale/runetype.c index a2ee9e6..ec1c2ec 100644 --- a/lib/libc/locale/runetype.c +++ b/lib/libc/locale/runetype.c @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); unsigned long ___runetype(c) - _BSD_CT_RUNE_T_ c; + __ct_rune_t c; { int x; _RuneRange *rr = &_CurrentRuneLocale->runetype_ext; diff --git a/lib/libc/locale/tolower.c b/lib/libc/locale/tolower.c index 42392d7..f8caecb 100644 --- a/lib/libc/locale/tolower.c +++ b/lib/libc/locale/tolower.c @@ -40,9 +40,9 @@ __FBSDID("$FreeBSD$"); #include <stdio.h> #include <rune.h> -_BSD_CT_RUNE_T_ +__ct_rune_t ___tolower(c) - _BSD_CT_RUNE_T_ c; + __ct_rune_t c; { int x; _RuneRange *rr = &_CurrentRuneLocale->maplower_ext; diff --git a/lib/libc/locale/toupper.c b/lib/libc/locale/toupper.c index 1871f8a..6ce6757 100644 --- a/lib/libc/locale/toupper.c +++ b/lib/libc/locale/toupper.c @@ -40,9 +40,9 @@ __FBSDID("$FreeBSD$"); #include <stdio.h> #include <rune.h> -_BSD_CT_RUNE_T_ +__ct_rune_t ___toupper(c) - _BSD_CT_RUNE_T_ c; + __ct_rune_t c; { int x; _RuneRange *rr = &_CurrentRuneLocale->mapupper_ext; diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h index 4d8926a..bfa4aab 100644 --- a/lib/libc/stdio/local.h +++ b/lib/libc/stdio/local.h @@ -69,7 +69,7 @@ extern int _fwalk(int (*)(FILE *)); extern int __swsetup(FILE *); extern int __sflags(const char *, int *); extern int __ungetc(int, FILE *); -extern int __vfprintf(FILE *, const char *, _BSD_VA_LIST_); +extern int __vfprintf(FILE *, const char *, __va_list); extern int __sdidinit; diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c index 9d55725..9e8efcf 100644 --- a/lib/libc/stdio/vasprintf.c +++ b/lib/libc/stdio/vasprintf.c @@ -39,7 +39,7 @@ int vasprintf(str, fmt, ap) char **str; const char *fmt; - _BSD_VA_LIST_ ap; + __va_list ap; { int ret; FILE f; diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c index 1f293d6..253870c 100644 --- a/lib/libc/stdio/vprintf.c +++ b/lib/libc/stdio/vprintf.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include <stdio.h> int -vprintf(const char *__restrict fmt, _BSD_VA_LIST_ ap) +vprintf(const char *__restrict fmt, __va_list ap) { return (vfprintf(stdout, fmt, ap)); diff --git a/lib/libc/stdio/vscanf.c b/lib/libc/stdio/vscanf.c index beed0c2..92f55fc 100644 --- a/lib/libc/stdio/vscanf.c +++ b/lib/libc/stdio/vscanf.c @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); int vscanf(fmt, ap) const char *fmt; - _BSD_VA_LIST_ ap; + __va_list ap; { int retval; diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c index eae9adc..7f18c83 100644 --- a/lib/libc/stdio/vsnprintf.c +++ b/lib/libc/stdio/vsnprintf.c @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); int vsnprintf(char *__restrict str, size_t n, const char *__restrict fmt, - _BSD_VA_LIST_ ap) + __va_list ap) { size_t on; int ret; diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c index b66b7c8..82e6297 100644 --- a/lib/libc/stdio/vsprintf.c +++ b/lib/libc/stdio/vsprintf.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include "local.h" int -vsprintf(char *__restrict str, const char *__restrict fmt, _BSD_VA_LIST_ ap) +vsprintf(char *__restrict str, const char *__restrict fmt, __va_list ap) { int ret; FILE f; diff --git a/lib/libc/stdio/vsscanf.c b/lib/libc/stdio/vsscanf.c index 58778f6..81a241c 100644 --- a/lib/libc/stdio/vsscanf.c +++ b/lib/libc/stdio/vsscanf.c @@ -62,7 +62,7 @@ int vsscanf(str, fmt, ap) const char *str; const char *fmt; - _BSD_VA_LIST_ ap; + __va_list ap; { FILE f; struct __sFILEX ext; |