From ccd728edbc6b02a245fc6b208873e6e0abb4cd30 Mon Sep 17 00:00:00 2001 From: eck Date: Tue, 27 Feb 1990 16:48:01 +0000 Subject: [PATCH] changed names of ?cvt : namespace problems --- lang/cem/libcc.ansi/stdio/doprnt.c | 2 +- lang/cem/libcc.ansi/stdio/ecvt.c | 4 ++-- lang/cem/libcc.ansi/stdio/fltpr.c | 4 ++-- lang/cem/libcc.ansi/stdio/gcvt.c | 4 ++-- lang/cem/libcc.ansi/stdio/loc_incl.h | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lang/cem/libcc.ansi/stdio/doprnt.c b/lang/cem/libcc.ansi/stdio/doprnt.c index dc11d28d6..c58d0f3ef 100644 --- a/lang/cem/libcc.ansi/stdio/doprnt.c +++ b/lang/cem/libcc.ansi/stdio/doprnt.c @@ -131,7 +131,7 @@ f_print(va_list *ap, int flags, char *s, char c, int precision) break; case 'g': case 'G': - s = gcvt(ld_val, precision, s, flags) + strlen(s); + s = _gcvt(ld_val, precision, s, flags) + strlen(s); break; } if ( c == 'E' || c == 'G') { diff --git a/lang/cem/libcc.ansi/stdio/ecvt.c b/lang/cem/libcc.ansi/stdio/ecvt.c index 449695e3c..86078faee 100644 --- a/lang/cem/libcc.ansi/stdio/ecvt.c +++ b/lang/cem/libcc.ansi/stdio/ecvt.c @@ -16,14 +16,14 @@ cvt(long double value, int ndigit, int *decpt, int *sign, int ecvtflag) } char * -ecvt(long double value, int ndigit, int *decpt, int *sign) +_ecvt(long double value, int ndigit, int *decpt, int *sign) { return cvt(value, ndigit, decpt, sign, 1); } char * -fcvt(long double value, int ndigit, int *decpt, int *sign) +_fcvt(long double value, int ndigit, int *decpt, int *sign) { return cvt(value, ndigit, decpt, sign, 0); } diff --git a/lang/cem/libcc.ansi/stdio/fltpr.c b/lang/cem/libcc.ansi/stdio/fltpr.c index 43613c6e4..6472cd7d1 100644 --- a/lang/cem/libcc.ansi/stdio/fltpr.c +++ b/lang/cem/libcc.ansi/stdio/fltpr.c @@ -13,7 +13,7 @@ _pfloat(long double r, register char *s, int n, int flags) int sign, dp; register int i; - s1 = fcvt(r, n, &dp, &sign); + s1 = _fcvt(r, n, &dp, &sign); if (sign) *s++ = '-'; else if (flags & FL_SIGN) @@ -45,7 +45,7 @@ _pscien(long double r, register char *s, int n, int flags) int sign, dp; register char *s1; - s1 = ecvt(r, n + 1, &dp, &sign); + s1 = _ecvt(r, n + 1, &dp, &sign); if (sign) *s++ = '-'; else if (flags & FL_SIGN) diff --git a/lang/cem/libcc.ansi/stdio/gcvt.c b/lang/cem/libcc.ansi/stdio/gcvt.c index fe33ebed7..5cfa750da 100644 --- a/lang/cem/libcc.ansi/stdio/gcvt.c +++ b/lang/cem/libcc.ansi/stdio/gcvt.c @@ -11,14 +11,14 @@ #define USE_EXP(exp, ndigits) (((exp) < LOW_EXP + 1) || (exp >= ndigits + 1)) char * -gcvt(long double value, int ndigit, char *s, int flags) +_gcvt(long double value, int ndigit, char *s, int flags) { int sign, dp; register char *s1, *s2; register int i; register int nndigit = ndigit; - s1 = ecvt(value, ndigit, &dp, &sign); + s1 = _ecvt(value, ndigit, &dp, &sign); s2 = s; if (sign) *s2++ = '-'; else if (flags & FL_SIGN) diff --git a/lang/cem/libcc.ansi/stdio/loc_incl.h b/lang/cem/libcc.ansi/stdio/loc_incl.h index a1934d63f..bbabe33af 100644 --- a/lang/cem/libcc.ansi/stdio/loc_incl.h +++ b/lang/cem/libcc.ansi/stdio/loc_incl.h @@ -20,9 +20,9 @@ FILE *fdopen(int fd, const char *mode); #ifndef NOFLOAT char *_pfloat(long double r, register char *s, int n, int flags); char *_pscien(long double r, register char *s, int n, int flags); -char *ecvt(long double value, int ndigit, int *decpt, int *sign); -char *fcvt(long double value, int ndigit, int *decpt, int *sign); -char *gcvt(long double value, int ndigit, char *s, int flags); +char *_ecvt(long double value, int ndigit, int *decpt, int *sign); +char *_fcvt(long double value, int ndigit, int *decpt, int *sign); +char *_gcvt(long double value, int ndigit, char *s, int flags); #endif /* NOFLOAT */ #define FL_LJUST 0x0001 /* left-justify field */ -- 2.34.1