From owner-svn-src-head@FreeBSD.ORG  Mon Jul 26 12:52:45 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3B3491065670;
	Mon, 26 Jul 2010 12:52:45 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2F0738FC12;
	Mon, 26 Jul 2010 12:52:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6QCqjhN074778;
	Mon, 26 Jul 2010 12:52:45 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6QCqjfd074775;
	Mon, 26 Jul 2010 12:52:45 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201007261252.o6QCqjfd074775@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 26 Jul 2010 12:52:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210498 - in head/sys: compat/freebsd32 sys
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jul 2010 12:52:45 -0000

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