svn commit: r230509 - head/tools/kerneldoc/subsys

[Alexander Leidinger]

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      =