Summary: | WTF TCSpinLock.h doesn't compile for x64 with Visual Studio | ||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Alex Christensen <alex.christensen> | ||||||||||||
Component: | WebKit Misc. | Assignee: | Nobody <webkit-unassigned> | ||||||||||||
Status: | RESOLVED WORKSFORME | ||||||||||||||
Severity: | Trivial | CC: | aroben, bfulgham, paroga, webkit.review.bot | ||||||||||||
Priority: | P4 | ||||||||||||||
Version: | 528+ (Nightly build) | ||||||||||||||
Hardware: | PC | ||||||||||||||
OS: | Windows 7 | ||||||||||||||
Attachments: |
|
Description
Alex Christensen
2012-05-29 16:08:59 PDT
Created attachment 144829 [details]
patch for Source/WTF/wtf/TCSpinLock.h
Created attachment 144833 [details]
patch
Every patch needs a ChangeLog entry: See http://www.webkit.org/coding/contributing.html for more information about this. Created attachment 145821 [details]
Patch
Comment on attachment 145821 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=145821&action=review Thanks for looking into this! I have a couple of minor requests, otherwise this looks great. > Source/WTF/ChangeLog:8 > + * wtf/TCSpinLock.h: Please state here that you modified the test for MSVC suitability. > Source/WTF/wtf/TCSpinLock.h:-37 > -#if (CPU(X86) || CPU(X86_64) || CPU(PPC)) && (COMPILER(GCC) || COMPILER(MSVC)) I don't care for the reformatting of these tests, since it loses the distinction between architecture and compiler. I would prefer to see something along the lines of: #if ((CPU(X86) || CPU(X86_64) || CPU(PPC)) && COMPILER(GCC)) || (CPU(X86) && COMPILER(MSVC)) Created attachment 147592 [details]
Patch
Attachment 147592 [details] did not pass style-queue:
Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/TC..." exit_code: 1
Source/WTF/ChangeLog:9: Line contains tab character. [whitespace/tab] [5]
Total errors found: 1 in 2 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 147595 [details]
Patch
Comment on attachment 147595 [details]
Patch
Looks great! Thanks for helping out with 64-bit work :-)
Comment on attachment 147595 [details] Patch Rejecting attachment 147595 [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: , u'--reviewer', u'Brent Fulg..." exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Parsed 2 diffs from patch file(s). patching file Source/WTF/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WTF/wtf/TCSpinLock.h Hunk #1 FAILED at 34. 1 out of 1 hunk FAILED -- saving rejects to file Source/WTF/wtf/TCSpinLock.h.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'Brent Fulg..." exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/12960357 what does this mean? (In reply to comment #11) > what does this mean? That's usually a merge conflict. If you want you can rebase you patch and upload it again, or I can commit it manually for you. This isn't needed any more since r120356. |