[tkined] Patches for scotty-2.1.10 (and possibly others) for Solaris

From: Doug Hughes (Doug.Hughes@Eng.Auburn.EDU)
Date: Thu Sep 20 2001 - 17:07:07 MET DST

Gets rid of some typedef conflicts for things already defined in
Solaris8. Somebody care to try these on Solaris7/2.6 to see if they
break anything?

*** ../tnm/generic/tnmNtp.c.orig Thu Sep 20 10:57:10 2001
--- ../tnm/generic/tnmNtp.c Thu Sep 20 11:05:00 2001
***************
*** 29,38 ****
      unsigned char data[(480 + 20)]; /* data + auth */
  };
  
! #if (SIZEOF_LONG == 8)
  typedef unsigned int ipaddr_t;
! #else
  typedef unsigned long ipaddr_t;
  #endif
  
  /*
--- 29,40 ----
      unsigned char data[(480 + 20)]; /* data + auth */
  };
  
! #ifndef sun
! # if (SIZEOF_LONG == 8)
  typedef unsigned int ipaddr_t;
! # else
  typedef unsigned long ipaddr_t;
+ # endif
  #endif
  
  /*

*** ../tnm/ntping/ntping.c.orig Thu Sep 20 11:02:22 2001
--- ../tnm/ntping/ntping.c Thu Sep 20 11:03:17 2001
***************
*** 67,73 ****
--- 67,75 ----
   */
  typedef unsigned int ipaddr_t;
  #else /* ! __alpha */
+ # ifndef sun
  typedef unsigned long ipaddr_t;
+ # endif
  #endif /* ! __alpha */
  typedef unsigned int int32; 

--
!! This message is brought to you via the `tkined & scotty' mailing list.
!! Please do not reply to this message to unsubscribe. To subscribe or
!! unsubscribe, send a mail message to <tkined-request@ibr.cs.tu-bs.de>.
!! See http://wwwsnmp.cs.utwente.nl/~schoenw/scotty/ for more information.

This archive was generated by hypermail 2b29 : Thu Jan 03 2002 - 14:56:27 MET