*** kern/kern_exit.c~	Sat Jun  6 07:14:20 1998
--- kern/kern_exit.c	Sun Dec 20 23:19:08 1998
***************
*** 73,79 ****
  #include <vm/vm_map.h>
  #include <vm/vm_zone.h>
  
! static MALLOC_DEFINE(M_ZOMBIE, "zombie", "zombie proc status");
  
  static int wait1 __P((struct proc *, struct wait_args *, int));
  
--- 73,79 ----
  #include <vm/vm_map.h>
  #include <vm/vm_zone.h>
  
! MALLOC_DEFINE(M_ZOMBIE, "zombie", "zombie proc status");
  
  static int wait1 __P((struct proc *, struct wait_args *, int));
  
*** kern/sys_socket.c~	Mon Jun  8 02:41:40 1998
--- kern/sys_socket.c	Sun Dec 20 23:19:38 1998
***************
*** 48,64 ****
  #include <net/if.h>
  #include <net/route.h>
  
! static int soo_read __P((struct file *fp, struct uio *uio, 
  		struct ucred *cred));
! static int soo_write __P((struct file *fp, struct uio *uio, 
  		struct ucred *cred));
! static int soo_close __P((struct file *fp, struct proc *p));
  
  struct	fileops socketops =
      { soo_read, soo_write, soo_ioctl, soo_poll, soo_close };
  
  /* ARGSUSED */
! static int
  soo_read(fp, uio, cred)
  	struct file *fp;
  	struct uio *uio;
--- 48,64 ----
  #include <net/if.h>
  #include <net/route.h>
  
! int soo_read __P((struct file *fp, struct uio *uio, 
  		struct ucred *cred));
! int soo_write __P((struct file *fp, struct uio *uio, 
  		struct ucred *cred));
! int soo_close __P((struct file *fp, struct proc *p));
  
  struct	fileops socketops =
      { soo_read, soo_write, soo_ioctl, soo_poll, soo_close };
  
  /* ARGSUSED */
! int
  soo_read(fp, uio, cred)
  	struct file *fp;
  	struct uio *uio;
***************
*** 69,75 ****
  }
  
  /* ARGSUSED */
! static int
  soo_write(fp, uio, cred)
  	struct file *fp;
  	struct uio *uio;
--- 69,75 ----
  }
  
  /* ARGSUSED */
! int
  soo_write(fp, uio, cred)
  	struct file *fp;
  	struct uio *uio;
***************
*** 161,167 ****
  }
  
  /* ARGSUSED */
! static int
  soo_close(fp, p)
  	struct file *fp;
  	struct proc *p;
--- 161,167 ----
  }
  
  /* ARGSUSED */
! int
  soo_close(fp, p)
  	struct file *fp;
  	struct proc *p;
*** sys/socketvar.h~	Sun Aug 23 12:37:17 1998
--- sys/socketvar.h	Sun Dec 20 23:20:35 1998
***************
*** 107,112 ****
--- 107,113 ----
  	uid_t	so_uid;			/* who opened the socket */
  	/* NB: generation count must not be first; easiest to make it last. */
  	so_gen_t so_gencnt;		/* generation count */
+         void    *so_emuldata;           /* Private data for emulators */
  };
  
  /*
*** conf/files~	Thu Oct 15 11:31:49 1998
--- conf/files	Sun Dec 20 23:21:10 1998
***************
*** 579,581 ****
--- 579,582 ----
  vm/vm_unix.c		standard
  vm/vnode_pager.c	standard
  vm/vm_zone.c		standard
+ dev/streams/streams.c	optional streams device-driver
*** kern/kern_resource.c.990108	Fri Jan  8 02:45:53 1999
--- kern/kern_resource.c	Fri Jan  8 02:46:12 1999
***************
*** 59,65 ****
  #include <vm/vm_map.h>
  
  static int donice __P((struct proc *curp, struct proc *chgp, int n));
! static int dosetrlimit __P((struct proc *p, u_int which, struct rlimit *limp));
  
  /*
   * Resource controls and accounting.
--- 59,65 ----
  #include <vm/vm_map.h>
  
  static int donice __P((struct proc *curp, struct proc *chgp, int n));
! int dosetrlimit __P((struct proc *p, u_int which, struct rlimit *limp));
  
  /*
   * Resource controls and accounting.
***************
*** 363,369 ****
  	return (dosetrlimit(p, uap->which, &alim));
  }
  
! static int
  dosetrlimit(p, which, limp)
  	struct proc *p;
  	u_int which;
--- 363,369 ----
  	return (dosetrlimit(p, uap->which, &alim));
  }
  
! int
  dosetrlimit(p, which, limp)
  	struct proc *p;
  	u_int which;