* 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@145608 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 761110f..f2cf222 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -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

diff --git a/libgfortran/io/io.h b/libgfortran/io/io.h
index 0be480e..95c7b04 100644 (file)
--- a/libgfortran/io/io.h
+++ b/libgfortran/io/io.h
@@ -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

diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c
index 5cac8ea..0d2650b 100644 (file)
--- a/libgfortran/io/unix.c
+++ b/libgfortran/io/unix.c
@@ -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;