From 96eb19e1a35c08302611225d14b34abe2d42e14c Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Tue, 7 Jul 1998 04:08:44 +0000
Subject: [PATCH] Quick fix for type mismatches which were fatal if longs
 aren't 32 bits.  We used a private, wrong, version of `struct dirent' to help
 break getdirentries(), and we use a silly check that the size of this struct
 is a power of 2 to help break mount() if getdirentries() would not work. 
 This fix just changes the struct to match `struct dirent' (except for the
 name length).

---
 sys/fs/procfs/procfs.h     | 10 +++++-----
 sys/miscfs/procfs/procfs.h | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys/fs/procfs/procfs.h b/sys/fs/procfs/procfs.h
index 9adee8a9aae..b727e16543a 100644
--- a/sys/fs/procfs/procfs.h
+++ b/sys/fs/procfs/procfs.h
@@ -37,7 +37,7 @@
  *	@(#)procfs.h	8.9 (Berkeley) 5/14/95
  *
  * From:
- *	$Id: procfs.h,v 1.18 1997/12/30 08:46:41 bde Exp $
+ *	$Id: procfs.h,v 1.19 1998/05/19 00:00:13 tegge Exp $
  */
 
 /*
@@ -103,10 +103,10 @@ struct pfsnode {
  */
 #define PROCFS_NAMELEN 8
 struct pfsdent {
-	u_long	d_fileno;
-	u_short	d_reclen;
-	u_char	d_type;
-	u_char	d_namlen;
+	u_int32_t d_fileno;
+	u_int16_t d_reclen;
+	u_int8_t  d_type;
+	u_int8_t  d_namlen;
 	char	d_name[PROCFS_NAMELEN];
 };
 #define UIO_MX sizeof(struct pfsdent)
diff --git a/sys/miscfs/procfs/procfs.h b/sys/miscfs/procfs/procfs.h
index 9adee8a9aae..b727e16543a 100644
--- a/sys/miscfs/procfs/procfs.h
+++ b/sys/miscfs/procfs/procfs.h
@@ -37,7 +37,7 @@
  *	@(#)procfs.h	8.9 (Berkeley) 5/14/95
  *
  * From:
- *	$Id: procfs.h,v 1.18 1997/12/30 08:46:41 bde Exp $
+ *	$Id: procfs.h,v 1.19 1998/05/19 00:00:13 tegge Exp $
  */
 
 /*
@@ -103,10 +103,10 @@ struct pfsnode {
  */
 #define PROCFS_NAMELEN 8
 struct pfsdent {
-	u_long	d_fileno;
-	u_short	d_reclen;
-	u_char	d_type;
-	u_char	d_namlen;
+	u_int32_t d_fileno;
+	u_int16_t d_reclen;
+	u_int8_t  d_type;
+	u_int8_t  d_namlen;
 	char	d_name[PROCFS_NAMELEN];
 };
 #define UIO_MX sizeof(struct pfsdent)