renamed _len to _length: conflict with name in minix lib
This commit is contained in:
parent
56033dc0c1
commit
63e0b36b41
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue