[Slashem-checkins] CVS: slashem/include unixconf.h,1.16,1.17

[J. A. H. <j_...@us...>]

Update of /cvsroot/slashem/slashem/include
In directory sc8-pr-cvs1:/tmp/cvs-serv2045/include

Modified Files:
	unixconf.h 
Log Message:
Merge changes from NetHack 3.4.2


Index: unixconf.h
===================================================================
RCS file: /cvsroot/slashem/slashem/include/unixconf.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** unixconf.h	18 May 2003 20:58:11 -0000	1.16
--- unixconf.h	25 Oct 2003 19:09:27 -0000	1.17
***************
*** 21,25 ****
  
  /* define exactly one of the following four choices */
! /* #define BSD 1 */	/* define for 4.n BSD  */
  			/* also for relatives like SunOS 4.x, DG/UX, and */
  			/* older versions of Linux */
--- 21,25 ----
  
  /* define exactly one of the following four choices */
! /* #define BSD 1 */	/* define for 4.n/Free/Open/Net BSD  */
  			/* also for relatives like SunOS 4.x, DG/UX, and */
  			/* older versions of Linux */
***************
*** 235,243 ****
  #define AMS_MAILBOX	"/Mailbox"
  #  else
  #define DEF_MAILREADER	"/usr/ucb/Mail"
  #  endif
  #else
  # if (defined(SYSV) || defined(DGUX) || defined(HPUX)) && !defined(LINUX)
! #  if defined(M_XENIX) || defined(__FreeBSD__)
  #define DEF_MAILREADER	"/usr/bin/mail"
  #  else
--- 235,247 ----
  #define AMS_MAILBOX	"/Mailbox"
  #  else
+ #   if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #define DEF_MAILREADER "/usr/bin/mail"
+ #   else
  #define DEF_MAILREADER	"/usr/ucb/Mail"
+ #   endif
  #  endif
  #else
  # if (defined(SYSV) || defined(DGUX) || defined(HPUX)) && !defined(LINUX)
! #  if defined(M_XENIX)
  #define DEF_MAILREADER	"/usr/bin/mail"
  #  else
***************
*** 370,374 ****
  
  /* Use the high quality random number routines. */
! #if defined(BSD) || defined(ULTRIX) || defined(CYGWIN32) || defined(RANDOM)
  #define Rand()	random()
  #else
--- 374,378 ----
  
  /* Use the high quality random number routines. */
! #if defined(BSD) || defined(LINUX) || defined(ULTRIX) || defined(CYGWIN32) || defined(RANDOM)
  #define Rand()	random()
  #else