Bug 111881 – Build fix: guard macro test for MAC platform for a feature

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit2

[Adenilson Cavalcanti Silva]

Changeset 145235 broke WebKit2 build thanks to a not defined macro. Compilation fails with:

/home/adenilson/apps/webkit/Webkit/Source/WebKit2/UIProcess/WebInspectorProxy.cpp:69:5: error: "__MAC_OS_X_VERSION_MIN_REQUIRED" is not defined [-Werror=undef]
cc1plus: all warnings being treated as errors

[Adenilson Cavalcanti Silva]

Created attachment 192261 [details]
Only test for OSX version if the platform is Mac

[David Kilzer (:ddkilzer)]

Comment on attachment 192261 [details]
Only test for OSX version if the platform is Mac

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

r=me with that change.

> Source/WebKit2/UIProcess/WebInspectorProxy.cpp:70
> +#if PLATFORM(MAC)
>  #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080

Usually we just use:

#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080

[Adenilson Cavalcanti Silva]

Created attachment 192262 [details]
Better use of macro conditionals as suggested by Reviewer

[David Kilzer (:ddkilzer)]

Comment on attachment 192262 [details]
Better use of macro conditionals as suggested by Reviewer

r=me

[David Kilzer (:ddkilzer)]

Comment on attachment 192262 [details]
Better use of macro conditionals as suggested by Reviewer

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

> Source/WebKit2/UIProcess/WebInspectorProxy.cpp:69
> +#if PLATFORM(MAC) &&  __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080

Nit: extra space after "&&".  I'll re-review if you want to fix.

[WebKit Review Bot]

Comment on attachment 192262 [details]
Better use of macro conditionals as suggested by Reviewer

Rejecting attachment 192262 [details] from commit-queue.

Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=webkit-commit-queue.appspot.com', '--bot-id=gce-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 192262, '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue

Last 500 characters of output:
rce/WebKit/chromium/webkit/media/crypto/ppapi/cdm --revision 181763 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium'
57>At revision 181763.

________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium'

________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium'
Updating webkit projects from gyp files...

Full output: http://webkit-commit-queue.appspot.com/results/17050637

[Adenilson Cavalcanti Silva]

Fixed by 145256