svn commit: r200606 - in head/sys: compat/freebsd32 sys

[Warner Losh]

Author: imp
Date: Wed Dec 16 17:17:40 2009
New Revision: 200606
URL: http://svn.freebsd.org/changeset/base/200606

Log:
  Fix compiling FREEBSD_COMPAT[4,5,6] without FREEBSD_COMPAT7.
  
  Note: Not sure this is the right way to do compat, but it makes the
  headers consistent with the implementations.

Modified:
  head/sys/compat/freebsd32/freebsd32_proto.h
  head/sys/sys/sysproto.h

Modified: head/sys/compat/freebsd32/freebsd32_proto.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_proto.h	Wed Dec 16 16:24:32 2009	(r200605)
+++ head/sys/compat/freebsd32/freebsd32_proto.h	Wed Dec 16 17:17:40 2009	(r200606)
@@ -692,7 +692,8 @@ int	freebsd6_freebsd32_ftruncate(struct 
 #endif /* COMPAT_FREEBSD6 */
 
 
-#ifdef COMPAT_FREEBSD7
+#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \
+    defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7)
 
 struct freebsd7_freebsd32_semctl_args {
 	char semid_l_[PADL_(int)]; int semid; char semid_r_[PADR_(int)];
@@ -714,7 +715,7 @@ int	freebsd7_freebsd32_semctl(struct thr
 int	freebsd7_freebsd32_msgctl(struct thread *, struct freebsd7_freebsd32_msgctl_args *);
 int	freebsd7_freebsd32_shmctl(struct thread *, struct freebsd7_freebsd32_shmctl_args *);
 
-#endif /* COMPAT_FREEBSD7 */
+#endif
 
 #define	FREEBSD32_SYS_AUE_freebsd32_wait4	AUE_WAIT4
 #define	FREEBSD32_SYS_AUE_freebsd4_freebsd32_getfsstat	AUE_GETFSSTAT

Modified: head/sys/sys/sysproto.h
==============================================================================
--- head/sys/sys/sysproto.h	Wed Dec 16 16:24:32 2009	(r200605)
+++ head/sys/sys/sysproto.h	Wed Dec 16 17:17:40 2009	(r200606)
@@ -2242,13 +2242,8 @@ int	freebsd4_sigreturn(struct thread *, 
 #endif /* COMPAT_FREEBSD4 */
 
 
-#ifdef COMPAT_FREEBSD6
-
-
-#endif /* COMPAT_FREEBSD6 */
-
-
-#ifdef COMPAT_FREEBSD7
+#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)];
@@ -2270,7 +2265,7 @@ int	freebsd7___semctl(struct thread *, s
 int	freebsd7_msgctl(struct thread *, struct freebsd7_msgctl_args *);
 int	freebsd7_shmctl(struct thread *, struct freebsd7_shmctl_args *);
 
-#endif /* COMPAT_FREEBSD7 */
+#endif
 
 #define	SYS_AUE_syscall	AUE_NULL
 #define	SYS_AUE_exit	AUE_EXIT