d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

renamed _len to _length: conflict with name in minix lib

Browse source
This commit is contained in:
ceriel 1996-11-26 15:02:36 +00:00
parent 56033dc0c1
commit 63e0b36b41
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lang/basic/lib/string.c
View file

@ -7,7 +7,7 @@
extern char *salloc() ; extern char *salloc() ;
_len(str) _length(str)
String *str; String *str;
{ {
okr(str); okr(str);
@ -64,7 +64,7 @@ String *s1,*s2;
int length; int length;
okr(s1); okr(s2); okr(s1); okr(s2);
s= (String *) salloc(sizeof(String)); s= (String *) salloc(sizeof(String));
s->strlength= _len(s1)+_len(s2); s->strlength= _length(s1)+_length(s2);
s->strval= salloc(s->strlength+1); s->strval= salloc(s->strlength+1);
s->strcount = 1; s->strcount = 1;
strcpy(s->strval,s2->strval); strcpy(s->strval,s2->strval);
@ -175,7 +175,7 @@ int length;
String *s; String *s;
int i; int i;
i= _len(str)-length; i= _length(str)-length;
if(i<0) i=0; if(i<0) i=0;
s= _newstr(str->strval+i); s= _newstr(str->strval+i);
return(s); return(s);

2
lang/basic/src/func.c
View file

@ -138,7 +138,7 @@ int *typetable;
C_lfr((arith) BEMPTRSIZE); C_lfr((arith) BEMPTRSIZE);
return(STRINGTYPE); return(STRINGTYPE);
case LENSYM: cv(STRINGTYPE); case LENSYM: cv(STRINGTYPE);
C_cal("_len"); C_cal("_length");
res=INTTYPE; res=INTTYPE;
parm(1); parm(1);
break; break;