diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2009-09-10 08:33:28 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2009-09-10 08:33:28 +0000 |
| commit | edefbdd7cbe5bce75b8c06e1c9e9d7b4cc2a875a (patch) | |
| tree | 9ba7f97d1f900d2e397cdc914d2996d68b6f4d9a /sys/sys/sysproto.h | |
| parent | 767a0b2dc96d1286b3247f38dde4de61d83963ea (diff) | |
| download | src-edefbdd7cbe5bce75b8c06e1c9e9d7b4cc2a875a.tar.gz src-edefbdd7cbe5bce75b8c06e1c9e9d7b4cc2a875a.zip | |
If a certain feature that was present in FreeBSD 7 was removed or changed in
FreeBSD 8, the compatibility shims should be built not just when FreeBSD 7
compatibility is requested, but also when compatibility with any older
FreeBSD version where that feature was present is requested.o
Without this patch, a kernel config that sets COMPAT_FREEBSD6 but not *7
would fail to build due to inconsistencies between the declaration of the
compatibility shims and their use in the SysV code.
There are similar errors in other *proto.h headers in the tree.
MFC after: 3 weeks
Notes
Notes:
svn path=/head/; revision=197057
Diffstat (limited to 'sys/sys/sysproto.h')
| -rw-r--r-- | sys/sys/sysproto.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index 7c654bffcb80..987cc3a5874e 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -2233,13 +2233,21 @@ int freebsd4_sigreturn(struct thread *, struct freebsd4_sigreturn_args *); #endif /* COMPAT_FREEBSD4 */ -#ifdef COMPAT_FREEBSD6 +#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) -#endif /* COMPAT_FREEBSD6 */ +#endif /* COMPAT_FREEBSD[45] */ -#ifdef COMPAT_FREEBSD7 +#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \ + defined(COMPAT_FREEBSD6) + + +#endif /* COMPAT_FREEBSD[456] */ + + +#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \ + defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7) struct freebsd7___semctl_args { char semid_l_[PADL_(int)]; int semid; char semid_r_[PADR_(int)]; @@ -2261,7 +2269,7 @@ int freebsd7___semctl(struct thread *, struct freebsd7___semctl_args *); int freebsd7_msgctl(struct thread *, struct freebsd7_msgctl_args *); int freebsd7_shmctl(struct thread *, struct freebsd7_shmctl_args *); -#endif /* COMPAT_FREEBSD7 */ +#endif /* COMPAT_FREEBSD[4567] */ #define SYS_AUE_syscall AUE_NULL #define SYS_AUE_exit AUE_EXIT |