[Linux-decnet-commit] CVS: latd server.cc,1.81,1.82 server.h,1.44,1.45

[Patrick C. <pa...@us...>]

Update of /cvsroot/linux-decnet/latd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26038

Modified Files:
	server.cc server.h 
Log Message:
Make it compile cleanly on Mac OS/X "Tiger"


Index: server.cc
===================================================================
RCS file: /cvsroot/linux-decnet/latd/server.cc,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -r1.81 -r1.82
*** server.cc	6 Mar 2005 13:37:51 -0000	1.81
--- server.cc	21 May 2005 14:21:46 -0000	1.82
***************
*** 64,68 ****
  #include "dn_endian.h"
  
! #ifdef __APPLE__
  typedef int socklen_t;
  #endif
--- 64,68 ----
  #include "dn_endian.h"
  
! #if defined (__APPLE__) && !defined(_SOCKLEN_T)
  typedef int socklen_t;
  #endif
***************
*** 343,348 ****
  void LATServer::send_solicit_messages(int sig)
  {
!     static int counter = 0;
!     static int last_list_size = 0;
      if (alarm_mode == 0)
      {
--- 343,349 ----
  void LATServer::send_solicit_messages(int sig)
  {
!     static unsigned int counter = 0;
!     static unsigned int last_list_size = 0;
! 
      if (alarm_mode == 0)
      {
***************
*** 526,529 ****
--- 527,531 ----
      struct timeval next_circuit_time;
      next_circuit_time.tv_sec = 0;
+     next_circuit_time.tv_usec = 0;
  #endif
  

Index: server.h
===================================================================
RCS file: /cvsroot/linux-decnet/latd/server.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** server.h	4 Jan 2004 15:49:04 -0000	1.44
--- server.h	21 May 2005 14:21:46 -0000	1.45
***************
*** 278,282 ****
      // LATCP configurable parameters
      int           circuit_timer;   // Default 8 (=80 ms)
!     int           multicast_timer; // Default 60 (seconds)
      int           retransmit_limit;// Default 20
      int           keepalive_timer; // Default 20 (seconds)
--- 278,282 ----
      // LATCP configurable parameters
      int           circuit_timer;   // Default 8 (=80 ms)
!     unsigned int  multicast_timer; // Default 60 (seconds)
      int           retransmit_limit;// Default 20
      int           keepalive_timer; // Default 20 (seconds)