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

[Konstantin Belousov]

Author: kib
Date: Mon Jul 26 12:52:44 2010
New Revision: 210498
URL: http://svn.freebsd.org/changeset/base/210498

Log:
  Revert r210451, and the similar part of the r210431. The forward-declaration
  for the enum tag when enum definition is not complete is not allowed by
  C99, and is gcc extension.
  
  Requested by:	stefanf
  MFC after:	28 days

Modified:
  head/sys/compat/freebsd32/freebsd32_util.h
  head/sys/sys/imgact.h

Modified: head/sys/compat/freebsd32/freebsd32_util.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_util.h	Mon Jul 26 12:47:39 2010	(r210497)
+++ head/sys/compat/freebsd32/freebsd32_util.h	Mon Jul 26 12:52:44 2010	(r210498)
@@ -34,6 +34,7 @@
 #include <sys/cdefs.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
+#include <sys/uio.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
@@ -101,7 +102,6 @@ int	freebsd32_copyiniov(struct iovec32 *
 	    struct iovec **iov, int error);
 void	freebsd32_rusage_out(const struct rusage *s, struct rusage32 *s32);
 
-enum uio_seg;
 struct image_args;
 int freebsd32_exec_copyin_args(struct image_args *args, char *fname,
 	    enum uio_seg segflg, u_int32_t *argv, u_int32_t *envv);

Modified: head/sys/sys/imgact.h
==============================================================================
--- head/sys/sys/imgact.h	Mon Jul 26 12:47:39 2010	(r210497)
+++ head/sys/sys/imgact.h	Mon Jul 26 12:52:44 2010	(r210498)
@@ -32,6 +32,8 @@
 #ifndef _SYS_IMGACT_H_
 #define	_SYS_IMGACT_H_
 
+#include <sys/uio.h>
+
 #define MAXSHELLCMDLEN	PAGE_SIZE
 
 struct image_args {
@@ -73,7 +75,6 @@ struct image_params {
 #ifdef _KERNEL
 struct sysentvec;
 struct thread;
-enum uio_seg;
 
 #define IMGACT_CORE_COMPRESS	0x01