OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

io.h (struct stream): Rename truncate to trunc. 

* io/io.h (struct stream): Rename truncate to trunc.
        (struncate): Same.
        * io/unix.c (raw_init): Rename truncate to trunc.
        (buf_init): Same.
        (open_internal): Same.

From-SVN: r145608
This commit is contained in:
David Edelsohn 2009-04-06 15:32:03 +00:00 committed by David Edelsohn
parent 439ef907ae
commit d26014d24e
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libgfortran/ChangeLog
View File

@ -1,3 +1,11 @@
2009-04-06 David Edelsohn <edelsohn@gnu.org>
* io/io.h (struct stream): Rename truncate to trunc.
(struncate): Same.
* io/unix.c (raw_init): Rename truncate to trunc.
(buf_init): Same.
(open_internal): Same.
2009-04-05 Daniel Kraft <d@domob.eu>
PR fortran/38654

5
libgfortran/io/io.h
View File

@ -53,7 +53,8 @@ typedef struct stream
ssize_t (*write) (struct stream *, const void *, ssize_t);
off_t (*seek) (struct stream *, off_t, int);
off_t (*tell) (struct stream *);
int (*truncate) (struct stream *, off_t);
/* Avoid keyword truncate due to AIX namespace collision. */
int (*trunc) (struct stream *, off_t);
int (*flush) (struct stream *);
int (*close) (struct stream *);
}
@ -87,7 +88,7 @@ stell (stream * s)
static inline int
struncate (stream * s, off_t length)
{
return s->truncate (s, length);
return s->trunc (s, length);
}
static inline int

6
libgfortran/io/unix.c
View File

@ -356,7 +356,7 @@ raw_init (unix_stream * s)
s->st.write = (void *) raw_write;
s->st.seek = (void *) raw_seek;
s->st.tell = (void *) raw_tell;
s->st.truncate = (void *) raw_truncate;
s->st.trunc = (void *) raw_truncate;
s->st.close = (void *) raw_close;
s->st.flush = (void *) raw_flush;
@ -565,7 +565,7 @@ buf_init (unix_stream * s)
s->st.write = (void *) buf_write;
s->st.seek = (void *) buf_seek;
s->st.tell = (void *) buf_tell;
s->st.truncate = (void *) buf_truncate;
s->st.trunc = (void *) buf_truncate;
s->st.close = (void *) buf_close;
s->st.flush = (void *) buf_flush;
@ -768,7 +768,7 @@ open_internal (char *base, int length, gfc_offset offset)
s->st.close = (void *) mem_close;
s->st.seek = (void *) mem_seek;
s->st.tell = (void *) mem_tell;
s->st.truncate = (void *) mem_truncate;
s->st.trunc = (void *) mem_truncate;
s->st.read = (void *) mem_read;
s->st.write = (void *) mem_write;
s->st.flush = (void *) mem_flush;