From owner-cvs-src@FreeBSD.ORG Fri Mar 3 22:05:26 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 46A8E16A420; Fri, 3 Mar 2006 22:05:26 +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 908E943D70; Fri, 3 Mar 2006 22:05:23 +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 k23M5NMY078278; Fri, 3 Mar 2006 22:05:23 GMT (envelope-from yar@repoman.freebsd.org) Received: (from yar@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k23M5NLP078277; Fri, 3 Mar 2006 22:05:23 GMT (envelope-from yar) Message-Id: <200603032205.k23M5NLP078277@repoman.freebsd.org> From: Yar Tikhiy Date: Fri, 3 Mar 2006 22:05:23 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 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: Fri, 03 Mar 2006 22:05:26 -0000 yar 2006-03-03 22:05:23 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/coda coda.h sys/modules/coda5 Makefile Log: MFC sys/coda/coda.h rev. 1.14, sys/modules/coda5/Makefile rev. 1.7: 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. Approved by: re (scottl) Revision Changes Path 1.13.2.1 +6 -1 src/sys/coda/coda.h 1.4.2.3 +1 -1 src/sys/modules/coda5/Makefile