diff options
| author | Bruce Dawson <brucedawson@chromium.org> | 2017-10-11 02:39:44 +0000 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-26 08:44:14 +0000 |
| commit | e70bf3d7246c1560b89dbc9c62455ca5c8579eea (patch) | |
| tree | 4baddcc5f7e45f2af3f1afe99efbee14cfd3837f | |
| parent | 4ce1cc53a004270cb6381bf166e87204be2d5fbd (diff) | |
[Backport] Update CLIENT_SDK declaration for 10.0.16299.0 SDKv5.10.0-beta3
The Fall Creators Update SDK (10.0.16299.0) adds a declaration for
CLIENT_SDK that is slightly different from the forward declaration used
by crashpad. This updates the crashpad forward declaration so that it
doesn't conflict.
Bug: 773476
Change-Id: I0e3f55ad6021f2cd51aef9a8d684f0664a158dc8
Reviewed-on: https://chromium-review.googlesource.com/710522
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#507871}
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/third_party/crashpad/README.chromium | 1 | ||||
| -rw-r--r-- | chromium/third_party/crashpad/crashpad/util/win/nt_internals.cc | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/chromium/third_party/crashpad/README.chromium b/chromium/third_party/crashpad/README.chromium index d4fc62d9380..348598c620c 100644 --- a/chromium/third_party/crashpad/README.chromium +++ b/chromium/third_party/crashpad/README.chromium @@ -36,3 +36,4 @@ $ git am --3way --message-id -p4 /tmp/patchdir Local Modifications: - codereview.settings has been excluded. + - the definition of CLIENT_ID has been updated to match the 10.0.16299.0 SDK
\ No newline at end of file diff --git a/chromium/third_party/crashpad/crashpad/util/win/nt_internals.cc b/chromium/third_party/crashpad/crashpad/util/win/nt_internals.cc index 97eba68b07e..88ec005aba5 100644 --- a/chromium/third_party/crashpad/crashpad/util/win/nt_internals.cc +++ b/chromium/third_party/crashpad/crashpad/util/win/nt_internals.cc @@ -19,7 +19,8 @@ // Declarations that the system headers should provide but don’t. -struct CLIENT_ID; +struct _CLIENT_ID; +typedef _CLIENT_ID CLIENT_ID; NTSTATUS NTAPI NtCreateThreadEx(PHANDLE ThreadHandle, ACCESS_MASK DesiredAccess, |