diff options
| author | das <das@FreeBSD.org> | 2004-05-02 10:56:26 +0000 |
|---|---|---|
| committer | das <das@FreeBSD.org> | 2004-05-02 10:56:26 +0000 |
| commit | 0342c52a187a490376a081f56bf3b22a229b7cd1 (patch) | |
| tree | eab26a1ee837a808a43bc10989d2ddc0d0884cc5 | |
| parent | 370a72c150689c295a5361ff11f88696cf50461e (diff) | |
| download | FreeBSD-src-0342c52a187a490376a081f56bf3b22a229b7cd1.zip FreeBSD-src-0342c52a187a490376a081f56bf3b22a229b7cd1.tar.gz | |
Merge vfscanf.c, v1.37:
- s/#ifdef FLOATING_POINT/#ifndef NO_FLOATING_POINT/
| -rw-r--r-- | lib/libc/stdio/vfwscanf.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/libc/stdio/vfwscanf.c b/lib/libc/stdio/vfwscanf.c index ee0c85e..5f7d48a 100644 --- a/lib/libc/stdio/vfwscanf.c +++ b/lib/libc/stdio/vfwscanf.c @@ -39,7 +39,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -__FBSDID("FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.35 2004/01/31 23:16:09 das Exp "); +__FBSDID("FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.37 2004/05/02 10:55:05 das +Exp"); #endif __FBSDID("$FreeBSD$"); @@ -58,9 +59,7 @@ __FBSDID("$FreeBSD$"); #include "libc_private.h" #include "local.h" -#define FLOATING_POINT - -#ifdef FLOATING_POINT +#ifndef NO_FLOATING_POINT #include <locale.h> #endif @@ -263,7 +262,7 @@ literal: base = 16; break; -#ifdef FLOATING_POINT +#ifndef NO_FLOATING_POINT case 'A': case 'E': case 'F': case 'G': case 'a': case 'e': case 'f': case 'g': c = CT_FLOAT; @@ -690,7 +689,7 @@ literal: nconversions++; break; -#ifdef FLOATING_POINT +#ifndef NO_FLOATING_POINT case CT_FLOAT: /* scan a floating point number as if by strtod */ if (width == 0 || width > sizeof(buf) / @@ -716,7 +715,7 @@ literal: nread += width; nconversions++; break; -#endif /* FLOATING_POINT */ +#endif /* !NO_FLOATING_POINT */ } } input_failure: @@ -725,7 +724,7 @@ match_failure: return (nassigned); } -#ifdef FLOATING_POINT +#ifndef NO_FLOATING_POINT static int parsefloat(FILE *fp, wchar_t *buf, wchar_t *end) { |
