diff options
| author | phk <phk@FreeBSD.org> | 2006-04-01 19:06:54 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2006-04-01 19:06:54 +0000 |
| commit | a6edaf1c5c5a75d8ff61e82e0a7a94d9066aa556 (patch) | |
| tree | 414dd43b4bfb97d3d754134156d9b721f643e6f5 /lib | |
| parent | 01ed5990aef062b97e91680895804b9689c8076b (diff) | |
| download | FreeBSD-src-a6edaf1c5c5a75d8ff61e82e0a7a94d9066aa556.zip FreeBSD-src-a6edaf1c5c5a75d8ff61e82e0a7a94d9066aa556.tar.gz | |
Add missing #if's for NO_FLOATING_POINT
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/stdio/vfprintf.c | 6 | ||||
| -rw-r--r-- | lib/libc/stdio/vfscanf.c | 2 | ||||
| -rw-r--r-- | lib/libc/stdio/vfwprintf.c | 6 | ||||
| -rw-r--r-- | lib/libc/stdio/vfwscanf.c | 2 | ||||
| -rw-r--r-- | lib/libc/stdio/xprintf.c | 4 |
5 files changed, 16 insertions, 4 deletions
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index 34e6bf0..df4bac2 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -1557,14 +1557,16 @@ done: case TP_INTMAXT: (*argtable) [n].pintmaxarg = va_arg (ap, intmax_t *); break; -#ifndef NO_FLOATING_POINT case T_DOUBLE: +#ifndef NO_FLOATING_POINT (*argtable) [n].doublearg = va_arg (ap, double); +#endif break; case T_LONG_DOUBLE: +#ifndef NO_FLOATING_POINT (*argtable) [n].longdoublearg = va_arg (ap, long double); - break; #endif + break; case TP_CHAR: (*argtable) [n].pchararg = va_arg (ap, char *); break; diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c index 27df280..465ee0d 100644 --- a/lib/libc/stdio/vfscanf.c +++ b/lib/libc/stdio/vfscanf.c @@ -98,7 +98,9 @@ __FBSDID("$FreeBSD$"); #define CT_FLOAT 4 /* %[efgEFG] conversion */ static const u_char *__sccl(char *, const u_char *); +#ifndef NO_FLOATING_POINT static int parsefloat(FILE *, char *, char *); +#endif int __scanfdebug = 0; diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c index 2a332e7..375d202 100644 --- a/lib/libc/stdio/vfwprintf.c +++ b/lib/libc/stdio/vfwprintf.c @@ -1549,14 +1549,16 @@ done: case TP_INTMAXT: (*argtable) [n].pintmaxarg = va_arg (ap, intmax_t *); break; -#ifndef NO_FLOATING_POINT case T_DOUBLE: +#ifndef NO_FLOATING_POINT (*argtable) [n].doublearg = va_arg (ap, double); +#endif break; case T_LONG_DOUBLE: +#ifndef NO_FLOATING_POINT (*argtable) [n].longdoublearg = va_arg (ap, long double); - break; #endif + break; case TP_CHAR: (*argtable) [n].pchararg = va_arg (ap, char *); break; diff --git a/lib/libc/stdio/vfwscanf.c b/lib/libc/stdio/vfwscanf.c index 327ec40..a855677 100644 --- a/lib/libc/stdio/vfwscanf.c +++ b/lib/libc/stdio/vfwscanf.c @@ -99,7 +99,9 @@ __FBSDID("$FreeBSD$"); #define CT_INT 3 /* %[dioupxX] conversion */ #define CT_FLOAT 4 /* %[efgEFG] conversion */ +#ifndef NO_FLOATING_POINT static int parsefloat(FILE *, wchar_t *, wchar_t *); +#endif extern int __scanfdebug; diff --git a/lib/libc/stdio/xprintf.c b/lib/libc/stdio/xprintf.c index c7814fa..8d529fc 100644 --- a/lib/libc/stdio/xprintf.c +++ b/lib/libc/stdio/xprintf.c @@ -496,10 +496,14 @@ __v2printf(FILE *fp, const char *fmt0, unsigned pct, const va_list ap) args[ch].pwchararg = va_arg (ap, wchar_t *); break; case PA_DOUBLE: +#ifndef NO_FLOATING_POINT args[ch].doublearg = va_arg (ap, double); +#endif break; case PA_DOUBLE | PA_FLAG_LONG_DOUBLE: +#ifndef NO_FLOATING_POINT args[ch].longdoublearg = va_arg (ap, long double); +#endif break; default: errx(1, "argtype = %x (fmt = \"%s\")\n", |
