Просмотр исходного кода

changed names of ?cvt : namespace problems

eck 34 лет назад
Родитель
Сommit
5a5a1f9e23

+ 1 - 1
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') {

+ 2 - 2
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);
 }

+ 2 - 2
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)

+ 2 - 2
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)

+ 3 - 3
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 */