Even better compatibility with 4.x. #define thread proc, since for

this file, that's a reasonable workaround.  Also, include sys/proc.h
for 4.x.

1 files changed, 2 insertions, 16 deletions

diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index 9d5fa31..a7650de 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -55,6 +55,8 @@
 
 #if __FreeBSD_version < 500000
 #define suser_td(a)	suser(a)
+#define thread	proc		/* Compat with new thread stuff */
+#include <sys/proc.h>
 #endif
 
 SYSCTL_NODE(_machdep, OID_AUTO, pccard, CTLFLAG_RW, 0, "pccard");
@@ -334,11 +336,7 @@ pccard_event(struct slot *slt, enum card_event event)
  *	Device driver interface.
  */
 static	int
-#if __FreeBSD_version >= 500000
 crdopen(dev_t dev, int oflags, int devtype, struct thread *td)
-#else
-crdopen(dev_t dev, int oflags, int devtype, struct proc *td)
-#endif
 {
 	struct slot *slt = PCCARD_DEV2SOFTC(dev);
 
@@ -354,11 +352,7 @@ crdopen(dev_t dev, int oflags, int devtype, struct proc *td)
  *	slots may be assigned to drivers already.
  */
 static	int
-#if __FreeBSD_version >= 500000
 crdclose(dev_t dev, int fflag, int devtype, struct thread *td)
-#else
-crdclose(dev_t dev, int fflag, int devtype, struct proc *td)
-#endif
 {
 	return (0);
 }
@@ -459,11 +453,7 @@ crdwrite(dev_t dev, struct uio *uio, int ioflag)
  *	descriptors, and assignment of drivers.
  */
 static	int
-#if __FreeBSD_version >= 500000
 crdioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct thread *td)
-#else
-crdioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct proc *td)
-#endif
 {
 	u_int32_t	addr;
 	int		err;
@@ -633,11 +623,7 @@ crdioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct proc *td)
  *	when a change in card status occurs.
  */
 static	int
-#if __FreeBSD_version >= 500000
 crdpoll(dev_t dev, int events, struct thread *td)
-#else
-crdpoll(dev_t dev, int events, struct proc *td)
-#endif
 {
 	int	revents = 0;
 	int	s;