Bug 58576 – Evaluate PLATFORM(GTK) before OS(WINDOWS)

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKitGTK

[Fridrich Strba]

This allow the Windows GTK build to chose the right branch before it is sucked by all-encompassing OS(WINDOWS) test

[Fridrich Strba]

Created attachment 89656 [details]
Patch

[Martin Robinson]

Comment on attachment 89656 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=89656&action=review

> Source/WebCore/platform/FileSystem.h:-80
> -#if OS(WINDOWS)

It might be better here to simply change this to #if OS(WINDOWS) && !PLATFORM(GTK)

[Fridrich Strba]

(In reply to comment #2)
> (From update of attachment 89656 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=89656&action=review
> 
> > Source/WebCore/platform/FileSystem.h:-80
> > -#if OS(WINDOWS)
> 
> It might be better here to simply change this to #if OS(WINDOWS) && !PLATFORM(GTK)

In my opinion, moving the 3 lines is producing more readable code and correspond to what for instance QT port does, the evaluation of its platform comes before the windows evaluation. There is already enough of forest of ifdefs so that the stuff be even more offuscated :)

[WebKit Commit Bot]

The commit-queue encountered the following flaky tests while processing attachment 89656 [details]:

http/tests/xmlhttprequest/logout.html bug 52047 (author: [e-mail])
The commit-queue is continuing to process your patch.

[WebKit Commit Bot]

Comment on attachment 89656 [details]
Patch

Clearing flags on attachment: 89656

Committed r84059: <http://trac.webkit.org/changeset/84059>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[WebKit Review Bot]

http://trac.webkit.org/changeset/84059 might have broken WinCairo Debug (Build)