external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

dtksh/sfio: resolved a naming collision on FreeBSD 11

Browse source
This commit is contained in:
alx 2016-12-30 02:43:57 +01:00 committed by Jon Trulson
parent ae7dd95cc4
commit acb2dd330d
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cde/programs/dtksh/ksh93/src/lib/libast/include/sfio.h
View file

@ -224,7 +224,7 @@ struct _sfio_
#define SF_IOCHECK 0002000 /* call exceptf before doing IO */
#define SF_PUBLIC 0004000 /* SF_SHARE and follow physical seek */
#define SF_FLAGS 0005177 /* PUBLIC FLAGS PASSABLE TO SFNEW() */
#define SFIO_FLAGS 0005177 /* PUBLIC FLAGS PASSABLE TO SFNEW() */
#define SF_SETS 0007163 /* flags passable to sfset() */
/* exception events: SF_NEW(0), SF_READ(1), SF_WRITE(2) and the below */

4
cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfclrlock.c
View file

@ -66,7 +66,7 @@ reg Sfio_t *f;
f->flags &= ~(SF_ERROR|SF_EOF);
if(!(f->mode&(SF_LOCK|SF_PEEK)) )
return (f->flags&SF_FLAGS);
return (f->flags&SFIO_FLAGS);
/* clear peek locks */
f->mode &= ~SF_PEEK;
@ -78,5 +78,5 @@ reg Sfio_t *f;
f->mode &= (SF_RDWR|SF_INIT|SF_POOL|SF_PUSH|SF_SYNCED|SF_STDIO);
return _sfmode(f,0,0) < 0 ? 0 : (f->flags&SF_FLAGS);
return _sfmode(f,0,0) < 0 ? 0 : (f->flags&SFIO_FLAGS);
}

2
cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfio_t.h
View file

@ -82,7 +82,7 @@
(unsigned char*)(data), /* endr */ \
(unsigned char*)(data), /* endb */ \
(struct _sfio_*)0, /* push */ \
(unsigned short)((type)&SF_FLAGS), /* flags */ \
(unsigned short)((type)&SFIO_FLAGS), /* flags */ \
(short)(file), /* file */ \
(unsigned char*)(data), /* data */ \
(int)(size), /* size */ \

2
cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfnew.c
View file

@ -115,7 +115,7 @@ int flags; /* type of file stream */
/* stream type */
f->mode = (flags&SF_READ) ? SF_READ : SF_WRITE;
f->flags = (flags&SF_FLAGS) | ((flags&SF_RDWR) == SF_RDWR ? SF_BOTH : 0);
f->flags = (flags&SFIO_FLAGS) | ((flags&SF_RDWR) == SF_RDWR ? SF_BOTH : 0);
f->flags |= (sflags&(SF_MALLOC|SF_STATIC));
f->file = file;
f->here = f->extent = 0L;

4
cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfset.c
View file

@ -62,7 +62,7 @@ reg int set;
reg int oflags;
if(flags == 0)
return (f->flags&SF_FLAGS);
return (f->flags&SFIO_FLAGS);
if((oflags = (f->mode&SF_RDWR)) != f->mode && _sfmode(f,oflags,0) < 0)
return 0;
@ -98,5 +98,5 @@ reg int set;
f->flags &= ~SF_PUBLIC;
SFOPEN(f,0);
return (oflags&SF_FLAGS);
return (oflags&SFIO_FLAGS);
}