| Summary: | Don't unconditionally define NOMINMAX on Windows | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Scott Graham <scottmg> | ||||||
| Component: | New Bugs | Assignee: | Scott Graham <scottmg> | ||||||
| Status: | RESOLVED FIXED | ||||||||
| Severity: | Normal | CC: | enne, webkit.review.bot | ||||||
| Priority: | P2 | ||||||||
| Version: | 528+ (Nightly build) | ||||||||
| Hardware: | Unspecified | ||||||||
| OS: | Unspecified | ||||||||
| Attachments: |
|
||||||||
|
Description
Scott Graham
2012-08-22 12:20:57 PDT
Created attachment 159988 [details]
Patch
Attachment 159988 [details] did not pass style-queue:
Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/TestWebKitAPI/co..." exit_code: 1
Tools/TestWebKitAPI/config.h:46: #ifndef header guard has wrong style, please use: config_h [build/header_guard] [5]
Total errors found: 1 in 2 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 159988 [details]
Patch
R=me. Silly style bot.
Comment on attachment 159988 [details] Patch Rejecting attachment 159988 [details] from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: ource/WebCore/ChangeLog CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Failed to merge in the changes. Patch failed at 0001 Skipping css3/flexbox/flexitem.html. When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 164. Full output: http://queues.webkit.org/results/13560388 Created attachment 160002 [details]
rebase
Attachment 160002 [details] did not pass style-queue:
Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/TestWebKitAPI/co..." exit_code: 1
Tools/TestWebKitAPI/config.h:46: #ifndef header guard has wrong style, please use: config_h [build/header_guard] [5]
Total errors found: 1 in 2 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 160002 [details] rebase Clearing flags on attachment: 160002 Committed r126356: <http://trac.webkit.org/changeset/126356> All reviewed patches have been landed. Closing bug. |