From owner-p4-projects@FreeBSD.ORG  Thu Aug 24 18:36:08 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 6379016A4E6; Thu, 24 Aug 2006 18:36:08 +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 3CE4F16A4E0
	for <perforce@freebsd.org>; Thu, 24 Aug 2006 18:36:08 +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 CD48243D45
	for <perforce@freebsd.org>; Thu, 24 Aug 2006 18:36:07 +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 k7OIa77e023665
	for <perforce@freebsd.org>; Thu, 24 Aug 2006 18:36:07 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7OIa7hQ023656
	for perforce@freebsd.org; Thu, 24 Aug 2006 18:36:07 GMT
	(envelope-from piso@freebsd.org)
Date: Thu, 24 Aug 2006 18:36:07 GMT
Message-Id: <200608241836.k7OIa7hQ023656@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 104970 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: Thu, 24 Aug 2006 18:36:08 -0000

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

Change 104970 by piso@piso_newluxor on 2006/08/24 18:35:27

	Axe some 4.x compatibility code i left in.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#4 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#7 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#3 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#4 edit

Differences ...

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

@@ -373,9 +373,7 @@
 		error = 0;
 		handler_chain_init();
 		break;
-#if __FreeBSD_version >= 500000
 	case MOD_QUIESCE:
-#endif
 	case MOD_UNLOAD:
 	        handler_chain_destroy();
 	        finishoff();

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

@@ -58,11 +58,7 @@
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/syslog.h>
-#if __FreeBSD_version < 500000
-#include <machine/limits.h>
-#else
 #include <sys/limits.h>
-#endif
 #else
 #include <errno.h>
 #include <sys/types.h>

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#3 (text+ko) ====

@@ -51,16 +51,11 @@
 #include <sys/sysctl.h>
 
 #ifdef _KERNEL
-#if __FreeBSD_version >= 500000
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/condvar.h>
-#else
-#include <sys/types.h>
-#include <sys/systm.h>
-#endif
 #endif
 
 /* XXX: LibAliasSetTarget() uses this constant. */

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

@@ -60,11 +60,7 @@
 #include <sys/libkern.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#if __FreeBSD_version < 500000
-#include <machine/limits.h>
-#else
 #include <sys/limits.h>
-#endif
 #else
 #include <sys/types.h>
 #include <sys/socket.h>