Bug 157798 – Fix the allinone-build after r198669

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Csaba Osztrogonác]

$ Tools/Scripts/build-webkit --efl --allinone-build

...

In file included from ../../Source/WebCore/DerivedSources.cpp:34:0:
DerivedSources/WebCore/ExceptionCodeDescription.h:41:5: error: "ENABLE" is not defined [-Werror=undef]
 #if ENABLE(INDEXED_DATABASE)
     ^
DerivedSources/WebCore/ExceptionCodeDescription.h:41:11: error: missing binary operator before token "("
 #if ENABLE(INDEXED_DATABASE)
           ^
cc1plus: all warnings being treated as errors

...

It's incorrect to use ENABLE macros anywhere without including config.h.
It's surprising how it builds on Apple Windows build.

[Csaba Osztrogonác]

Created attachment 279134 [details]
Patch

[Alex Christensen]

I think a better solution would be to #include config.h in DerivedSources.cpp.

[Michael Catanzaro]

Comment on attachment 279134 [details]
Patch

(Reviewed this before reading Alex's comment.)

[Csaba Osztrogonác]

(In reply to comment #2)
> I think a better solution would be to #include config.h in
> DerivedSources.cpp.

Unfortunately it doesn't work. Including config.h causes more problems:

In file included from ../../Source/WebCore/bindings/js/JSDOMPromise.h:29:0,
                 from ../../Source/WebCore/html/HTMLMediaElement.h:35,
                 from ../../Source/WebCore/html/HTMLAudioElement.h:31,
                 from DerivedSources/WebCore/HTMLElementFactory.cpp:128,
                 from ../../Source/WebCore/DerivedSources.cpp:36:
../../Source/WebCore/bindings/js/JSDOMBinding.h: In instantiation of 'void WebCore::uncacheWrapper(WebCore::DOMWrapperWorld&, DOMClass*, WrapperClass*) [with DOMClass = JSC::Profile; WrapperClass = WebCore::JSScriptProfile]':
DerivedSources/WebCore/JSScriptProfile.cpp:174:71:   required from here
../../Source/WebCore/bindings/js/JSDOMBinding.h:457:44: error: cannot convert 'JSC::Profile*' to 'JSC::ArrayBuffer*' for argument '1' to 'void* WebCore::wrapperKey(JSC::ArrayBuffer*)'
../../Source/WebCore/bindings/js/JSDOMBinding.h: In instantiation of 'void WebCore::uncacheWrapper(WebCore::DOMWrapperWorld&, DOMClass*, WrapperClass*) [with DOMClass = JSC::ProfileNode; WrapperClass = WebCore::JSScriptProfileNode]':
DerivedSources/WebCore/JSScriptProfileNode.cpp:229:79:   required from here
../../Source/WebCore/bindings/js/JSDOMBinding.h:457:44: error: cannot convert 'JSC::ProfileNode*' to 'JSC::ArrayBuffer*' for argument '1' to 'void* WebCore::wrapperKey(JSC::ArrayBuffer*)'


I don't have time to investigate newer and newer failures, 
I still would like to propose my original patch.

[Csaba Osztrogonác]

Comment on attachment 279134 [details]
Patch

Let's land it as is. And then let anybody to fix DerivedSources.cpp if there is any interest in it.

[WebKit Commit Bot]

Comment on attachment 279134 [details]
Patch

Clearing flags on attachment: 279134

Committed r201074: <http://trac.webkit.org/changeset/201074>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.