From 63e0b36b41f2dc5339e9ba98c19865953e0b5422 Mon Sep 17 00:00:00 2001 From: ceriel Date: Tue, 26 Nov 1996 15:02:36 +0000 Subject: [PATCH] renamed _len to _length: conflict with name in minix lib --- lang/basic/lib/string.c | 6 +++--- lang/basic/src/func.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/basic/lib/string.c b/lang/basic/lib/string.c index fb14afb7a..bc8485991 100644 --- a/lang/basic/lib/string.c +++ b/lang/basic/lib/string.c @@ -7,7 +7,7 @@ extern char *salloc() ; -_len(str) +_length(str) String *str; { okr(str); @@ -64,7 +64,7 @@ String *s1,*s2; int length; okr(s1); okr(s2); s= (String *) salloc(sizeof(String)); - s->strlength= _len(s1)+_len(s2); + s->strlength= _length(s1)+_length(s2); s->strval= salloc(s->strlength+1); s->strcount = 1; strcpy(s->strval,s2->strval); @@ -175,7 +175,7 @@ int length; String *s; int i; - i= _len(str)-length; + i= _length(str)-length; if(i<0) i=0; s= _newstr(str->strval+i); return(s); diff --git a/lang/basic/src/func.c b/lang/basic/src/func.c index fb8ebf3ee..f7510f994 100644 --- a/lang/basic/src/func.c +++ b/lang/basic/src/func.c @@ -138,7 +138,7 @@ int *typetable; C_lfr((arith) BEMPTRSIZE); return(STRINGTYPE); case LENSYM: cv(STRINGTYPE); - C_cal("_len"); + C_cal("_length"); res=INTTYPE; parm(1); break;