From owner-p4-projects@FreeBSD.ORG  Mon Oct 30 17:21:01 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 069FD16A416; Mon, 30 Oct 2006 17:21:01 +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 BC25B16A407
	for <perforce@freebsd.org>; Mon, 30 Oct 2006 17:21:00 +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 9F6A743D53
	for <perforce@freebsd.org>; Mon, 30 Oct 2006 17:21:00 +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 k9UHL0gQ086045
	for <perforce@freebsd.org>; Mon, 30 Oct 2006 17:21:00 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9UHL0Ek086039
	for perforce@freebsd.org; Mon, 30 Oct 2006 17:21:00 GMT
	(envelope-from piso@freebsd.org)
Date: Mon, 30 Oct 2006 17:21:00 GMT
Message-Id: <200610301721.k9UHL0Ek086039@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 108764 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: Mon, 30 Oct 2006 17:21:01 -0000

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

Change 108764 by piso@piso_newluxor on 2006/10/30 17:20:34

	Rename LIBALIAS_LOCK_INIT and LIBALIAS_LOCK_DESTROY to
	LIBALIAS_RWLOCK_INIT and LIBALIAS_RWLOCK_DESTROY to avoid
	name clashes.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#25 edit

Differences ...

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

@@ -60,9 +60,9 @@
 
 #ifdef _KERNEL
 
-#define	LIBALIAS_LOCK_INIT() \
+#define	LIBALIAS_RWLOCK_INIT() \
         rw_init(&handler_rw, "Libalias_modules_rwlock")
-#define	LIBALIAS_LOCK_DESTROY()	rw_destroy(&handler_rw)
+#define	LIBALIAS_RWLOCK_DESTROY()	rw_destroy(&handler_rw)
 #define	LIBALIAS_WLOCK_ASSERT() \
         rw_assert(&handler_rw, RA_WLOCKED)
 
@@ -95,7 +95,7 @@
 {
 
 	if (!rw_initialized(&handler_rw))
-		LIBALIAS_LOCK_INIT();
+		LIBALIAS_RWLOCK_INIT();
 }
 
 static void
@@ -103,12 +103,12 @@
 {
 
 	if (rw_initialized(&handler_rw))
-		LIBALIAS_LOCK_DESTROY();
+		LIBALIAS_RWLOCK_DESTROY();
 }
 
 #else
-#define	LIBALIAS_LOCK_INIT() ;
-#define	LIBALIAS_LOCK_DESTROY()	;
+#define	LIBALIAS_RWLOCK_INIT() ;
+#define	LIBALIAS_RWLOCK_DESTROY()	;
 #define	LIBALIAS_WLOCK_ASSERT()	;
 #define	LIBALIAS_RLOCK() ;
 #define	LIBALIAS_RUNLOCK() ;