# HG changeset patch # User John W. Eaton # Date 1286431205 14400 # Node ID f9284142a0603233ca7667bacd85c5e013442013 # Parent 36ceff79607b543c6dbe3c932c5276c8f4067a07 avoid another use of ::fileno diff -r 36ceff79607b -r f9284142a060 src/ChangeLog --- a/src/ChangeLog Wed Oct 06 18:13:11 2010 -0400 +++ b/src/ChangeLog Thu Oct 07 02:00:05 2010 -0400 @@ -1,3 +1,8 @@ +2010-10-07 John W. Eaton + + * file-io.cc (do_stream_open): Use fileno instead of ::fileno to + avoid problems if fileno is a macro. + 2010-10-05 John W. Eaton * oct-stdstrm.h (octave_stdiostream::octave_stdiostream): Use diff -r 36ceff79607b -r f9284142a060 src/file-io.cc --- a/src/file-io.cc Wed Oct 06 18:13:11 2010 -0400 +++ b/src/file-io.cc Thu Oct 07 02:00:05 2010 -0400 @@ -494,7 +494,7 @@ FILE *fptr = ::fopen (fname.c_str (), tmode.c_str ()); - int fd = ::fileno (fptr); + int fd = fileno (fptr); gzFile gzf = ::gzdopen (fd, tmode.c_str ());