[aspell-user] .33.5 vs sparc-solaris2.6/gcc-2.95.3: conflict on 'fileno'

[Will Partain]

This is probably a known buglet, but here goes anyway...

In compiling .33.5 with gcc-2.95.3 on a sparc-solaris2.6
box, I bumped into:

/our/bin/g++ -DHAVE_CONFIG_H -I. -I. -I.. -I/.-ark-deploy/aspell--.33.5/include 
-I/our/include -I/our/include -O2 -fstrict-aliasing -c file_util.cc  -fPIC 
-DPIC -o .libs/file_util.o
In file included from file_util.cc:4:
simple_fstream.hh:45: macro `fileno' used without args
file_util.cc:41: macro `fileno' used without args
file_util.cc:50: macro `fileno' used without args
file_util.cc:73: macro `fileno' used without args
file_util.cc:92: macro `fileno' used without args

I worked around it with the patch below.  Keep up the good
work,

Will

diff -rc1 ../aspell-.33.5/util/file_util.cc ./util/file_util.cc
*** ../aspell-.33.5/util/file_util.cc   Wed Mar 28 09:46:08 2001
--- ./util/file_util.cc Tue Apr 17 10:59:40 2001
***************
*** 40,42 ****
      struct stat s;
!     fstat(f.fileno(), &s);
      return s.st_mtime;
--- 40,42 ----
      struct stat s;
!     fstat(f.fileNo(), &s);
      return s.st_mtime;
***************
*** 49,51 ****
  #ifdef USE_FILE_LOCKS 
!     int fd = in.fileno();
      struct flock fl;
--- 49,51 ----
  #ifdef USE_FILE_LOCKS 
!     int fd = in.fileNo();
      struct flock fl;
***************
*** 72,74 ****
  #ifdef USE_FILE_LOCKS 
!     int fd = inout.fileno();
      struct flock fl;
--- 72,74 ----
  #ifdef USE_FILE_LOCKS 
!     int fd = inout.fileNo();
      struct flock fl;
***************
*** 91,93 ****
      f.restart();
!     ftruncate(f.fileno(),0);
  #else
--- 91,93 ----
      f.restart();
!     ftruncate(f.fileNo(),0);
  #else
diff -rc1 ../aspell-.33.5/util/simple_fstream.cc ./util/simple_fstream.cc
*** ../aspell-.33.5/util/simple_fstream.cc      Wed Mar 28 09:46:08 2001
--- ./util/simple_fstream.cc    Tue Apr 17 11:01:28 2001
***************
*** 20,24 ****
  
!   int SimpleFstream::fileno() 
    {
!     return ::fileno(file_);
    }
--- 20,24 ----
  
!   int SimpleFstream::fileNo() 
    {
!     return fileno(file_);
    }
diff -rc1 ../aspell-.33.5/util/simple_fstream.hh ./util/simple_fstream.hh
*** ../aspell-.33.5/util/simple_fstream.hh      Fri Mar 23 19:39:50 2001
--- ./util/simple_fstream.hh    Tue Apr 17 10:59:39 2001
***************
*** 44,46 ****
      void skipws();
!     int fileno();
      void flush() {fflush(file_);}
--- 44,46 ----
      void skipws();
!     int fileNo();
      void flush() {fflush(file_);}