Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(540)

Issue 224883004: Apply upstream qcmstypes.h patch to avoid conflicts with MSVC's stdint.h (Closed)

Created:
6 years, 8 months ago by Reid Kleckner
Modified:
6 years, 6 months ago
CC:
chromium-reviews
Visibility:
Public.

Description

Apply upstream qcmstypes.h patch to avoid conflicts with MSVC's stdint.h This avoids errors from Clang about a conflicting typedef for uintptr_t, which should really be unsigned int instead of unsigned long. We already had a local patch to suppress MSVC's warning here. Rather than trying to get the right definition, just include stdint.h, which has been available since VS2010. R=thakis@chromium.org TBR=brettw@chromium.org BUG=82385 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=276887

Patch Set 1 #

Patch Set 2 : try something else #

Total comments: 1

Patch Set 3 : change link #

Unified diffs Side-by-side diffs Delta from patch set Stats (+61 lines, -36 lines) Patch
M third_party/qcms/README.chromium View 1 2 1 chunk +2 lines, -0 lines 0 comments Download
M third_party/qcms/google.patch View 1 2 chunks +58 lines, -2 lines 0 comments Download
M third_party/qcms/src/qcmstypes.h View 1 3 chunks +1 line, -34 lines 0 comments Download

Messages

Total messages: 18 (0 generated)
Reid Kleckner
6 years, 8 months ago (2014-04-04 00:58:24 UTC) #1
Nico
We try to be good open-source citizens and also send patches upstream (or at least ...
6 years, 8 months ago (2014-04-04 01:05:46 UTC) #2
Nico
Oh, and let me point out this line from third_party/OWNERS as it's unusual: # For ...
6 years, 8 months ago (2014-04-04 22:49:21 UTC) #3
Reid Kleckner (google)
Sure. I had held off because I'm not sure if Mozilla will want this change. ...
6 years, 8 months ago (2014-04-04 23:41:26 UTC) #4
Nico
They'd probably take a patch to include stdint.h if msvs >= 2013 (2010 has that ...
6 years, 8 months ago (2014-04-04 23:43:32 UTC) #5
chromium-reviews
Apparently they applied a similar patch earlier this year: http://hg.mozilla.org/mozilla-central/rev/b5be94737a83 1.39 <http://hg.mozilla.org/mozilla-central/rev/b5be94737a83#l1.39> -#elif defined (_MSC_VER) ...
6 years, 6 months ago (2014-06-11 17:21:25 UTC) #6
Reid Kleckner
new patch, ptal
6 years, 6 months ago (2014-06-12 16:39:23 UTC) #7
Nico
lgtm https://codereview.chromium.org/224883004/diff/20001/third_party/qcms/README.chromium File third_party/qcms/README.chromium (right): https://codereview.chromium.org/224883004/diff/20001/third_party/qcms/README.chromium#newcode38 third_party/qcms/README.chromium:38: - https://bugzilla.mozilla.org/show_bug.cgi?id=957002 Maybe link to https://hg.mozilla.org/mozilla-central/rev/b5be94737a83 , the ...
6 years, 6 months ago (2014-06-12 18:46:29 UTC) #8
Reid Kleckner
The CQ bit was checked by rnk@chromium.org
6 years, 6 months ago (2014-06-12 18:58:50 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/rnk@chromium.org/224883004/40001
6 years, 6 months ago (2014-06-12 19:00:00 UTC) #10
commit-bot: I haz the power
FYI, CQ is re-trying this CL (attempt #1). The failing builders are: chromium_presubmit on tryserver.chromium ...
6 years, 6 months ago (2014-06-13 01:19:00 UTC) #11
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 6 months ago (2014-06-13 01:22:26 UTC) #12
commit-bot: I haz the power
Try jobs failed on following builders: chromium_presubmit on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/chromium_presubmit/builds/73474)
6 years, 6 months ago (2014-06-13 01:22:26 UTC) #13
Reid Kleckner
Gonna TBR Brett.
6 years, 6 months ago (2014-06-13 01:46:22 UTC) #14
Reid Kleckner
The CQ bit was checked by rnk@chromium.org
6 years, 6 months ago (2014-06-13 01:46:27 UTC) #15
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/rnk@chromium.org/224883004/40001
6 years, 6 months ago (2014-06-13 01:48:22 UTC) #16
Nico
$ cat third_party/OWNERS # Owner approval for 3rd party is only required for # adding ...
6 years, 6 months ago (2014-06-13 01:49:34 UTC) #17
commit-bot: I haz the power
6 years, 6 months ago (2014-06-13 02:19:40 UTC) #18
Message was sent while issue was closed.
Change committed as 276887

Powered by Google App Engine
This is Rietveld 408576698