From owner-svn-src-all@FreeBSD.ORG  Tue Jan 24 15:13:56 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 070F7106564A;
	Tue, 24 Jan 2012 15:13:56 +0000 (UTC)
	(envelope-from netchild@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EA00B8FC08;
	Tue, 24 Jan 2012 15:13:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0OFDtDe080663;
	Tue, 24 Jan 2012 15:13:55 GMT
	(envelope-from netchild@svn.freebsd.org)
Received: (from netchild@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0OFDtfM080661;
	Tue, 24 Jan 2012 15:13:55 GMT
	(envelope-from netchild@svn.freebsd.org)
Message-Id: <201201241513.q0OFDtfM080661@svn.freebsd.org>
From: Alexander Leidinger <netchild@FreeBSD.org>
Date: Tue, 24 Jan 2012 15:13:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230509 - head/tools/kerneldoc/subsys
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Jan 2012 15:13:56 -0000

Author: netchild
Date: Tue Jan 24 15:13:55 2012
New Revision: 230509
URL: http://svn.freebsd.org/changeset/base/230509

Log:
  Just define __FreeBSD__ to 1 instead of doing what the compiler does.
  The kernel is supposed to DTRT based upon the __FreeBSD_version value,
  not the value of __FreeBSD__.
  
  Discussed with:	bz

Modified:
  head/tools/kerneldoc/subsys/common-Doxyfile

Modified: head/tools/kerneldoc/subsys/common-Doxyfile
==============================================================================
--- head/tools/kerneldoc/subsys/common-Doxyfile	Tue Jan 24 14:27:14 2012	(r230508)
+++ head/tools/kerneldoc/subsys/common-Doxyfile	Tue Jan 24 15:13:55 2012	(r230509)
@@ -230,8 +230,12 @@ SEARCH_INCLUDES        = YES
 INCLUDE_PATH           = $(DOXYGEN_SRC_INCLUDE_PATH) \
                          .
 INCLUDE_FILE_PATTERNS  = *.h
+# __FreeBSD__ is normally defined to the the major version number of
+# FreeBSD. In the kernel source it is just checked for != 0, and
+# __FreeBSD_version is used for version dependend code.
+# To make live simple on major version bumps, just define __FreeBSD__ to 1.
 PREDEFINED             = _KERNEL \
-                         __FreeBSD__=10 \
+                         __FreeBSD__=1 \
                          __${TARGET_ARCH}__=1 \
                          __${TARGET_ARCH}=1
 EXPAND_AS_DEFINED      =