*** sh.exp.c.orig	Tue Jul  5 13:38:26 1994
--- sh.exp.c	Tue Aug 30 08:24:18 1994
***************
*** 155,161 ****
       * and they define _SC_NGROUPS_MAX without having sysconf
       */
  #   undef _SC_NGROUPS_MAX	
! #   ifdef __NetBSD__
  #    define GID_T gid_t
  #   else
  #    define GID_T int
--- 155,161 ----
       * and they define _SC_NGROUPS_MAX without having sysconf
       */
  #   undef _SC_NGROUPS_MAX	
! #   if defined(__NetBSD__) || __FreeBSD__ == 2
  #    define GID_T gid_t
  #   else
  #    define GID_T int
*** sh.func.c.orig	Tue Jul  5 13:38:29 1994
--- sh.func.c	Tue Aug 30 08:33:46 1994
***************
*** 1614,1620 ****
  #   define toset(a) ((a) + 1)
  #  endif /* aiws */
  # else /* BSDLIMIT */
! #  if defined(BSD4_4) && !defined(__386BSD__) && !defined(bsdi)
      typedef quad_t RLIM_TYPE;
  #  else
      typedef unsigned long RLIM_TYPE;
--- 1614,1620 ----
  #   define toset(a) ((a) + 1)
  #  endif /* aiws */
  # else /* BSDLIMIT */
! #  if __FreeBSD__ == 2 || defined(BSD4_4) && !defined(__386BSD__) && !defined(bsdi)
      typedef quad_t RLIM_TYPE;
  #  else
      typedef unsigned long RLIM_TYPE;