18228: trunk/xapian-core/ trunk/xapian-core/include/xapian/

SVN root:       svn://svn.xapian.org/xapian
Changes by:     olly
Revision:       18228
Date:           2014-09-03 20:01:57 +0100 (Wed, 03 Sep 2014)

Log message (7 lines):
generate-exceptions,include/xapian/: Use XAPIAN_IN_XAPIAN_H rather
than XAPIAN_INCLUDED_XAPIAN_H in the direct inclusion of subheader
checks.  Currently neither will catch the case of the user including
a sub-header after <xapian.h> since the include guard for the
subheader will stop us getting to the direct inclusion check, but
XAPIAN_IN_XAPIAN_H will work if we move the check outside the
include guard.

Modified files:
U   trunk/xapian-core/ChangeLog
U   trunk/xapian-core/generate-exceptions
U   trunk/xapian-core/include/xapian/attributes.h
U   trunk/xapian-core/include/xapian/compactor.h
U   trunk/xapian-core/include/xapian/constants.h
U   trunk/xapian-core/include/xapian/database.h
U   trunk/xapian-core/include/xapian/dbfactory.h
U   trunk/xapian-core/include/xapian/deprecated.h
U   trunk/xapian-core/include/xapian/derefwrapper.h
U   trunk/xapian-core/include/xapian/document.h
U   trunk/xapian-core/include/xapian/enquire.h
U   trunk/xapian-core/include/xapian/errorhandler.h
U   trunk/xapian-core/include/xapian/expanddecider.h
U   trunk/xapian-core/include/xapian/geospatial.h
U   trunk/xapian-core/include/xapian/intrusive_ptr.h
U   trunk/xapian-core/include/xapian/keymaker.h
U   trunk/xapian-core/include/xapian/matchspy.h
U   trunk/xapian-core/include/xapian/positioniterator.h
U   trunk/xapian-core/include/xapian/postingiterator.h
U   trunk/xapian-core/include/xapian/postingsource.h
U   trunk/xapian-core/include/xapian/query.h
U   trunk/xapian-core/include/xapian/queryparser.h
U   trunk/xapian-core/include/xapian/registry.h
U   trunk/xapian-core/include/xapian/snipper.h
U   trunk/xapian-core/include/xapian/stem.h
U   trunk/xapian-core/include/xapian/termgenerator.h
U   trunk/xapian-core/include/xapian/termiterator.h
U   trunk/xapian-core/include/xapian/types.h
U   trunk/xapian-core/include/xapian/unicode.h
U   trunk/xapian-core/include/xapian/valueiterator.h
U   trunk/xapian-core/include/xapian/valuesetmatchdecider.h

Links:
http://xapian.org/C?18228
http://xapian.org/C?18228?trunk/xapian-core/ChangeLog
http://xapian.org/C?18228?trunk/xapian-core/generate-exceptions
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/attributes.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/compactor.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/constants.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/database.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/dbfactory.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/deprecated.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/derefwrapper.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/document.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/enquire.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/errorhandler.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/expanddecider.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/geospatial.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/intrusive_ptr.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/keymaker.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/matchspy.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/positioniterator.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/postingiterator.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/postingsource.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/query.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/queryparser.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/registry.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/snipper.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/stem.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/termgenerator.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/termiterator.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/types.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/unicode.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/valueiterator.h
http://xapian.org/C?18228?trunk/xapian-core/include/xapian/valuesetmatchdecider.h