[webkit-dev] Re: [webkit-changes] [29033] trunk

Alp Toker alp at atoker.com
Sat Dec 29 23:20:07 PST 2007


Alexey Proskuryakov wrote:
> on 30.12.2007 06:33, alp at webkit.org at alp at webkit.org wrote:
> 
>>         http://bugs.webkit.org/show_bug.cgi?id=16669
>>         autotools update and fixes
> ...
>> +        * dom/Document.cpp:
>> +        * loader/icon/IconDatabase.h:
>> +        * page/DOMWindow.cpp:
>> +        * page/InspectorController.cpp:
>> +        * page/Settings.cpp:
>> +        * storage/Database.h:
>> +          - Remove ENABLE(DATABASE) inclusion guard. Let the includer add the
>> guard instead.
> 
>   Is this something needed for autotools? I think our approach was to have
> guards in headers, and there are many more examples of this, e.g. with SVG
> and XSLT.
> 

The discussion in bug #16669 suggests this was a clean-up to make 
conditional database support consistent with conditional icon database 
support. A quick grep shows precedent for this with other features, eg. 
Frame.cpp:

#if ENABLE(SVG)
#include "SVGDocument.h"
#include "SVGDocumentExtensions.h"
#include "SVGNames.h"
#include "XLinkNames.h"
#endif

If it's causing trouble with other build systems it might be better to 
add guards within the header files instead. No strong feelings either way.


More information about the webkit-dev mailing list