[fam] [patch] changes to compile fam-oss-2.6.2 with gcc 2.95.2

[nightOwl <peter.zijlstra@xxxxxxxxx>]

Hi,.

I grabbed fam to build EFM (Enlightenment File Manager) and found I
needed to following changes to make it compile on my system.
I'm running linux-2.3.99-pre6-3 on a somewhat modified Mandrake 7.0b
which comes with gcc 2.95.2.

have phun with it :-)

regards,
Peter Zijlstra

BTW, I'm not on this list, so if u feel the need to contact me use mail.

diff -rc fam-oss-2.6.2/fam/IMonNone.c++ fam-mod/fam/IMonNone.c++
*** fam-oss-2.6.2/fam/IMonNone.c++      Fri Mar 24 01:30:16 2000
--- fam-mod/fam/IMonNone.c++    Sat Apr 15 16:29:27 2000
***************
*** 21,26 ****
--- 21,27 ----
  //  Temple Place - Suite 330, Boston MA 02111-1307, USA.
  
  #include "IMon.h"
+ #include "Log.h"
  
  int IMon::imon_open()
  {
diff -rc fam-oss-2.6.2/fam/Listener.c++ fam-mod/fam/Listener.c++
*** fam-oss-2.6.2/fam/Listener.c++      Thu Mar  2 01:51:19 2000
--- fam-mod/fam/Listener.c++    Sat Apr 15 16:26:48 2000
***************
*** 153,159 ****
      // Get the new socket.
  
      struct sockaddr_in addr;
!     int addrlen = sizeof addr;
      int client_fd = accept(rendezvous_fd, (struct sockaddr *) &addr, 
&addrlen);
      if (client_fd < 0)
      {
--- 153,159 ----
      // Get the new socket.
  
      struct sockaddr_in addr;
!     unsigned int addrlen = sizeof addr;
      int client_fd = accept(rendezvous_fd, (struct sockaddr *) &addr, 
&addrlen);
      if (client_fd < 0)
      {
***************
*** 272,278 ****
      // Get the new socket.
  
      struct sockaddr_un sun = { AF_UNIX, "" };
!     int sunlen = sizeof(sun);
      int client_fd = accept(ofd, (struct sockaddr *) &sun, &sunlen);
      if (client_fd < 0)
      {
--- 272,278 ----
      // Get the new socket.
  
      struct sockaddr_un sun = { AF_UNIX, "" };
!     unsigned int sunlen = sizeof(sun);
      int client_fd = accept(ofd, (struct sockaddr *) &sun, &sunlen);
      if (client_fd < 0)
      {
***************
*** 400,406 ****
      //  Accept a new ugly connection.
  
      struct sockaddr_un sun;
!     int sunlen = sizeof sun;
      int sock = accept(ugly, (struct sockaddr *)(&sun), &sunlen);
      if (sock < 0)
      {   Log::perror("accept");
--- 400,406 ----
      //  Accept a new ugly connection.
  
      struct sockaddr_un sun;
!     unsigned int sunlen = sizeof sun;
      int sock = accept(ugly, (struct sockaddr *)(&sun), &sunlen);
      if (sock < 0)
      {   Log::perror("accept");
diff -rc fam-oss-2.6.2/fam/NFSFileSystem.c++ fam-mod/fam/NFSFileSystem.c++
*** fam-oss-2.6.2/fam/NFSFileSystem.c++ Thu Mar  2 01:51:19 2000
--- fam-mod/fam/NFSFileSystem.c++       Sat Apr 15 16:27:53 2000
***************
*** 26,31 ****
--- 26,32 ----
  #include <assert.h>
  #include <mntent.h>
  #include <stdlib.h>
+ #include <stdio.h>
  #include <string.h>
  
  #include "Log.h"
diff -rc fam-oss-2.6.2/fam/Scheduler.c++ fam-mod/fam/Scheduler.c++
*** fam-oss-2.6.2/fam/Scheduler.c++     Thu Mar  2 01:51:20 2000
--- fam-mod/fam/Scheduler.c++   Sat Apr 15 16:08:26 2000
***************
*** 304,310 ****
  }
  
  void
! Scheduler::handle_io(const fd_set *fds, FDInfo::handler FDInfo::* iotype)
  {
      if (fds)
        for (int fd = 0; fd < nfds; fd++)
--- 304,310 ----
  }
  
  void
! Scheduler::handle_io(const fd_set *fds, FDInfo::_handler FDInfo::* iotype)
  {
      if (fds)
        for (int fd = 0; fd < nfds; fd++)
diff -rc fam-oss-2.6.2/fam/Scheduler.h fam-mod/fam/Scheduler.h
*** fam-oss-2.6.2/fam/Scheduler.h       Thu Mar  2 01:51:24 2000
--- fam-mod/fam/Scheduler.h     Sat Apr 15 16:08:43 2000
***************
*** 93,99 ****
      //  closures.
  
      struct FDInfo {
!       struct handler {
            IOHandler handler;
            void *closure;
        } read, write;
--- 93,99 ----
      //  closures.
  
      struct FDInfo {
!       struct _handler {
            IOHandler handler;
            void *closure;
        } read, write;
***************
*** 104,113 ****
      //  for the corresponding I/O type.
  
      struct IOTypeInfo {
!       FDInfo::handler FDInfo::*const iotype;
        unsigned int nbitsset;          // number of bits set in fds
        fd_set fds;
!       IOTypeInfo(FDInfo::handler FDInfo::* a_iotype) :
              iotype(a_iotype), nbitsset(0) { FD_ZERO(&fds); }
      };
  
--- 104,113 ----
      //  for the corresponding I/O type.
  
      struct IOTypeInfo {
!       FDInfo::_handler FDInfo::*const iotype;
        unsigned int nbitsset;          // number of bits set in fds
        fd_set fds;
!       IOTypeInfo(FDInfo::_handler FDInfo::* a_iotype) :
              iotype(a_iotype), nbitsset(0) { FD_ZERO(&fds); }
      };
  
***************
*** 143,149 ****
                                        IOHandler handler, void *closure,
                                        IOTypeInfo *iotype);
      static IOHandler remove_io_handler(int fd, IOTypeInfo *iotype);
!     static void handle_io(const fd_set *fds, FDInfo::handler FDInfo::* 
iotype);
  
      // Timed task related functions
  
--- 143,149 ----
                                        IOHandler handler, void *closure,
                                        IOTypeInfo *iotype);
      static IOHandler remove_io_handler(int fd, IOTypeInfo *iotype);
!     static void handle_io(const fd_set *fds, FDInfo::_handler FDInfo::* 
iotype);
  
      // Timed task related functions