commit 330d99fc5ab783d6afff97ff429f34e78452b741
author Mark Mentovai <mark@chromium.org> Sat Jun 27 00:42:33 2020 -0400
committer Copybara-Service <copybara-worker@google.com> Tue Jan 19 07:10:09 2021 -0800
tree cb82b69fbba719235f2683c40a81ec6f167e315f
parent 33b37ac65acd15f897d48837ca94984bc7070b2e

Use OS_WIN, not OS_WINDOWS; provide crashpad_types traits for Fuchsia

The incorrect macro was used in f4b906c79c02 (at my request when I was
reviewing from a phone).

The Windows and Fuchsia builds are broken, so…

TBR: epastor@google.com
Change-Id: Id825dbe39c855b0b6ea1a3233d2c061c434f89cd
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2270920
Commit-Queue: Mark Mentovai <mark@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
GitOrigin-RevId: 09d1df04bfa750f91d8b325454eadcb015b9e39d

snapshot/crashpad_types/crashpad_info_reader.cc

diff --git a/snapshot/crashpad_types/crashpad_info_reader.cc b/snapshot/crashpad_types/crashpad_info_reader.cc
index e4c8b93..9d0c781 100644
--- a/snapshot/crashpad_types/crashpad_info_reader.cc
+++ b/snapshot/crashpad_types/crashpad_info_reader.cc
@@ -20,10 +20,12 @@
 #include "client/crashpad_info.h"
 #include "util/misc/as_underlying_type.h"
 
-#if defined(OS_WINDOWS)
+#if defined(OS_WIN)
 #include "util/win/traits.h"
 #elif defined(OS_LINUX) || defined(OS_ANDROID)
 #include "util/linux/traits.h"
+#elif defined(OS_FUCHSIA)
+#include "util/fuchsia/traits.h"
 #endif
 
 namespace crashpad {

util/BUILD.gn

diff --git a/util/BUILD.gn b/util/BUILD.gn
index 388bc14..bfd7536 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -544,6 +544,7 @@
       "fuchsia/koid_utilities.h",
       "fuchsia/scoped_task_suspend.cc",
       "fuchsia/scoped_task_suspend.h",
+      "fuchsia/traits.h",
       "misc/capture_context_fuchsia.S",
       "misc/paths_fuchsia.cc",
       "process/process_memory_fuchsia.cc",

util/fuchsia/traits.h

diff --git a/util/fuchsia/traits.h b/util/fuchsia/traits.h
new file mode 100644
index 0000000..5cdedc1
--- /dev/null
+++ b/util/fuchsia/traits.h
@@ -0,0 +1,32 @@
+// Copyright 2020 The Crashpad Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef CRASHPAD_UTIL_FUCHSIA_TRAITS_H_
+#define CRASHPAD_UTIL_FUCHSIA_TRAITS_H_
+
+#include <stdint.h>
+
+namespace crashpad {
+
+struct Traits32 {
+  using Address = uint32_t;
+};
+
+struct Traits64 {
+  using Address = uint64_t;
+};
+
+}  // namespace crashpad
+
+#endif  // CRASHPAD_UTIL_FUCHSIA_TRAITS_H_