From owner-p4-projects@FreeBSD.ORG  Tue Sep 12 15:11:37 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 372B316A4A7; Tue, 12 Sep 2006 15:11:37 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D82C816A522
	for <perforce@freebsd.org>; Tue, 12 Sep 2006 15:11:36 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9677B43D5D
	for <perforce@freebsd.org>; Tue, 12 Sep 2006 15:11:35 +0000 (GMT)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8CFBZiP046595
	for <perforce@freebsd.org>; Tue, 12 Sep 2006 15:11:35 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8CFBZcn046592
	for perforce@freebsd.org; Tue, 12 Sep 2006 15:11:35 GMT
	(envelope-from piso@freebsd.org)
Date: Tue, 12 Sep 2006 15:11:35 GMT
Message-Id: <200609121511.k8CFBZcn046592@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 106020 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: Tue, 12 Sep 2006 15:11:37 -0000

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

Change 106020 by piso@piso_longino on 2006/09/12 15:11:33

	Axe some compatibility code for FreeBSD 5.x.  

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#9 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_pptp.c#10 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#9 (text+ko) ====

@@ -2588,11 +2588,7 @@
 /* Firewall include files */
 #include <net/if.h>
 
-#if __FreeBSD__ < 5
-#include <netinet/ip_fw2.h> 
-#else
 #include <netinet/ip_fw.h>
-#endif
 #include <string.h>
 #include <err.h>
 

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_pptp.c#10 (text+ko) ====

@@ -41,11 +41,7 @@
 
 /* Includes */
 #ifdef _KERNEL
-#if __FreeBSD__ >= 5
 #include <sys/limits.h>
-#else
-#include <machine/limits.h>
-#endif
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/ctype.h>