From owner-p4-projects@FreeBSD.ORG  Wed Jul 23 08:38:23 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EBF6C1065685; Wed, 23 Jul 2008 08:38:22 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B06611065678
	for <perforce@freebsd.org>; Wed, 23 Jul 2008 08:38:22 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AFF258FC29
	for <perforce@freebsd.org>; Wed, 23 Jul 2008 08:38:22 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6N8cMLs045342
	for <perforce@freebsd.org>; Wed, 23 Jul 2008 08:38:22 GMT
	(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6N8cMXb045340
	for perforce@freebsd.org; Wed, 23 Jul 2008 08:38:22 GMT
	(envelope-from zec@tel.fer.hr)
Date: Wed, 23 Jul 2008 08:38:22 GMT
Message-Id: <200807230838.m6N8cMXb045340@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@tel.fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 145681 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Jul 2008 08:38:23 -0000

http://perforce.freebsd.org/chv.cgi?CH=145681

Change 145681 by zec@zec_tpx32 on 2008/07/23 08:38:13

	Unbreak GENERIC build.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/fil.c#4 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#7 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/fil.c#4 (text+ko) ====

@@ -27,7 +27,7 @@
 #if defined(_KERNEL) && defined(__FreeBSD_version) && \
     (__FreeBSD_version >= 220000)
 # if (__FreeBSD_version >= 400000)
-#  if !defined(IPFILTER_LKM)
+#  if (__FreeBSD_version >= 800000)
 #   include "opt_vimage.h"
 #   include "opt_inet6.h"
 #   include <sys/vimage.h>

==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#7 (text+ko) ====

@@ -61,7 +61,7 @@
 #include <sys/random.h>
 #include <sys/limits.h>
 #include <sys/queue.h>
-#if defined(__FreeBSD__) && __FreeBSD_version > 800000 && defined(VIMAGE)
+#if defined(__FreeBSD__) && __FreeBSD_version > 800000
 #include <sys/vimage.h>
 #endif
 #include <machine/cpu.h>