From owner-cvs-src@FreeBSD.ORG Mon Feb 27 12:04:14 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A58416A420; Mon, 27 Feb 2006 12:04:14 +0000 (GMT) (envelope-from yar@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC0DC43D48; Mon, 27 Feb 2006 12:04:13 +0000 (GMT) (envelope-from yar@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1RC4DnF099628; Mon, 27 Feb 2006 12:04:13 GMT (envelope-from yar@repoman.freebsd.org) Received: (from yar@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1RC4DJ5099627; Mon, 27 Feb 2006 12:04:13 GMT (envelope-from yar) Message-Id: <200602271204.k1RC4DJ5099627@repoman.freebsd.org> From: Yar Tikhiy Date: Mon, 27 Feb 2006 12:04:13 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/coda coda.h src/sys/modules/coda5 Makefile X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 12:04:14 -0000 yar 2006-02-27 12:04:13 UTC FreeBSD src repository Modified files: sys/coda coda.h sys/modules/coda5 Makefile Log: CODA_COMPAT_5 may not be defined unconditionally in the coda5 module. Otherwise a kernel build would break in the coda5 module if the main kernel conf file enabled CODA_COMPAT_5, too. Redefined symbols are strictly disallowed by -Werror. To overcome this issue, introduce a different symbol indicating coda5 build, CODA5_MODULE, and translate it to CODA_COMPAT_5 appropriately in /sys/coda/coda.h. MFC after: 3 days Revision Changes Path 1.14 +6 -1 src/sys/coda/coda.h 1.7 +1 -1 src/sys/modules/coda5/Makefile