Add missing #if's for NO_FLOATING_POINT
This commit is contained in:
parent
634e63c986
commit
75239a017f
@ -1557,14 +1557,16 @@ reswitch: switch (ch) {
|
|||||||
case TP_INTMAXT:
|
case TP_INTMAXT:
|
||||||
(*argtable) [n].pintmaxarg = va_arg (ap, intmax_t *);
|
(*argtable) [n].pintmaxarg = va_arg (ap, intmax_t *);
|
||||||
break;
|
break;
|
||||||
#ifndef NO_FLOATING_POINT
|
|
||||||
case T_DOUBLE:
|
case T_DOUBLE:
|
||||||
|
#ifndef NO_FLOATING_POINT
|
||||||
(*argtable) [n].doublearg = va_arg (ap, double);
|
(*argtable) [n].doublearg = va_arg (ap, double);
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
case T_LONG_DOUBLE:
|
case T_LONG_DOUBLE:
|
||||||
|
#ifndef NO_FLOATING_POINT
|
||||||
(*argtable) [n].longdoublearg = va_arg (ap, long double);
|
(*argtable) [n].longdoublearg = va_arg (ap, long double);
|
||||||
break;
|
|
||||||
#endif
|
#endif
|
||||||
|
break;
|
||||||
case TP_CHAR:
|
case TP_CHAR:
|
||||||
(*argtable) [n].pchararg = va_arg (ap, char *);
|
(*argtable) [n].pchararg = va_arg (ap, char *);
|
||||||
break;
|
break;
|
||||||
|
@ -98,7 +98,9 @@ __FBSDID("$FreeBSD$");
|
|||||||
#define CT_FLOAT 4 /* %[efgEFG] conversion */
|
#define CT_FLOAT 4 /* %[efgEFG] conversion */
|
||||||
|
|
||||||
static const u_char *__sccl(char *, const u_char *);
|
static const u_char *__sccl(char *, const u_char *);
|
||||||
|
#ifndef NO_FLOATING_POINT
|
||||||
static int parsefloat(FILE *, char *, char *);
|
static int parsefloat(FILE *, char *, char *);
|
||||||
|
#endif
|
||||||
|
|
||||||
int __scanfdebug = 0;
|
int __scanfdebug = 0;
|
||||||
|
|
||||||
|
@ -1549,14 +1549,16 @@ reswitch: switch (ch) {
|
|||||||
case TP_INTMAXT:
|
case TP_INTMAXT:
|
||||||
(*argtable) [n].pintmaxarg = va_arg (ap, intmax_t *);
|
(*argtable) [n].pintmaxarg = va_arg (ap, intmax_t *);
|
||||||
break;
|
break;
|
||||||
#ifndef NO_FLOATING_POINT
|
|
||||||
case T_DOUBLE:
|
case T_DOUBLE:
|
||||||
|
#ifndef NO_FLOATING_POINT
|
||||||
(*argtable) [n].doublearg = va_arg (ap, double);
|
(*argtable) [n].doublearg = va_arg (ap, double);
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
case T_LONG_DOUBLE:
|
case T_LONG_DOUBLE:
|
||||||
|
#ifndef NO_FLOATING_POINT
|
||||||
(*argtable) [n].longdoublearg = va_arg (ap, long double);
|
(*argtable) [n].longdoublearg = va_arg (ap, long double);
|
||||||
break;
|
|
||||||
#endif
|
#endif
|
||||||
|
break;
|
||||||
case TP_CHAR:
|
case TP_CHAR:
|
||||||
(*argtable) [n].pchararg = va_arg (ap, char *);
|
(*argtable) [n].pchararg = va_arg (ap, char *);
|
||||||
break;
|
break;
|
||||||
|
@ -99,7 +99,9 @@ __FBSDID("$FreeBSD$");
|
|||||||
#define CT_INT 3 /* %[dioupxX] conversion */
|
#define CT_INT 3 /* %[dioupxX] conversion */
|
||||||
#define CT_FLOAT 4 /* %[efgEFG] conversion */
|
#define CT_FLOAT 4 /* %[efgEFG] conversion */
|
||||||
|
|
||||||
|
#ifndef NO_FLOATING_POINT
|
||||||
static int parsefloat(FILE *, wchar_t *, wchar_t *);
|
static int parsefloat(FILE *, wchar_t *, wchar_t *);
|
||||||
|
#endif
|
||||||
|
|
||||||
extern int __scanfdebug;
|
extern int __scanfdebug;
|
||||||
|
|
||||||
|
@ -496,10 +496,14 @@ __v2printf(FILE *fp, const char *fmt0, unsigned pct, const va_list ap)
|
|||||||
args[ch].pwchararg = va_arg (ap, wchar_t *);
|
args[ch].pwchararg = va_arg (ap, wchar_t *);
|
||||||
break;
|
break;
|
||||||
case PA_DOUBLE:
|
case PA_DOUBLE:
|
||||||
|
#ifndef NO_FLOATING_POINT
|
||||||
args[ch].doublearg = va_arg (ap, double);
|
args[ch].doublearg = va_arg (ap, double);
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
case PA_DOUBLE | PA_FLAG_LONG_DOUBLE:
|
case PA_DOUBLE | PA_FLAG_LONG_DOUBLE:
|
||||||
|
#ifndef NO_FLOATING_POINT
|
||||||
args[ch].longdoublearg = va_arg (ap, long double);
|
args[ch].longdoublearg = va_arg (ap, long double);
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
errx(1, "argtype = %x (fmt = \"%s\")\n",
|
errx(1, "argtype = %x (fmt = \"%s\")\n",
|
||||||
|
Loading…
Reference in New Issue
Block a user