diff options
| author | imp <imp@FreeBSD.org> | 2009-12-16 21:53:56 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2009-12-16 21:53:56 +0000 |
| commit | 747567aeb766cd7c7c2b03680b98803b81ebcae0 (patch) | |
| tree | d652ae6c358679226b21293d071ad46c4baad96f | |
| parent | 760ca3284b84f83b005b6fe75111fa6f918e9cdd (diff) | |
| download | FreeBSD-src-747567aeb766cd7c7c2b03680b98803b81ebcae0.zip FreeBSD-src-747567aeb766cd7c7c2b03680b98803b81ebcae0.tar.gz | |
Revert 200606.
| -rw-r--r-- | sys/compat/freebsd32/freebsd32_proto.h | 5 | ||||
| -rw-r--r-- | sys/sys/sysproto.h | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h index 742827f..7418dbd 100644 --- a/sys/compat/freebsd32/freebsd32_proto.h +++ b/sys/compat/freebsd32/freebsd32_proto.h @@ -692,8 +692,7 @@ int freebsd6_freebsd32_ftruncate(struct thread *, struct freebsd6_freebsd32_ftru #endif /* COMPAT_FREEBSD6 */ -#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \ - defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7) +#ifdef COMPAT_FREEBSD7 struct freebsd7_freebsd32_semctl_args { char semid_l_[PADL_(int)]; int semid; char semid_r_[PADR_(int)]; @@ -715,7 +714,7 @@ int freebsd7_freebsd32_semctl(struct thread *, struct freebsd7_freebsd32_semctl_ int freebsd7_freebsd32_msgctl(struct thread *, struct freebsd7_freebsd32_msgctl_args *); int freebsd7_freebsd32_shmctl(struct thread *, struct freebsd7_freebsd32_shmctl_args *); -#endif +#endif /* COMPAT_FREEBSD7 */ #define FREEBSD32_SYS_AUE_freebsd32_wait4 AUE_WAIT4 #define FREEBSD32_SYS_AUE_freebsd4_freebsd32_getfsstat AUE_GETFSSTAT diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index 5089d39..a97a0ae 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -2242,8 +2242,13 @@ int freebsd4_sigreturn(struct thread *, struct freebsd4_sigreturn_args *); #endif /* COMPAT_FREEBSD4 */ -#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \ - defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7) +#ifdef COMPAT_FREEBSD6 + + +#endif /* COMPAT_FREEBSD6 */ + + +#ifdef COMPAT_FREEBSD7 struct freebsd7___semctl_args { char semid_l_[PADL_(int)]; int semid; char semid_r_[PADR_(int)]; @@ -2265,7 +2270,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 +#endif /* COMPAT_FREEBSD7 */ #define SYS_AUE_syscall AUE_NULL #define SYS_AUE_exit AUE_EXIT |
