win: Get client/crashpad_info.cc to compile

client/crashpad_info.cc

Index: client/crashpad_info.cc
diff --git a/client/crashpad_info.cc b/client/crashpad_info.cc
index 507c5005e0855d53fbfdac4189928c98dd0ce98c..540ec411f9cd60412903e412d59eab7e6056aa2c 100644
--- a/client/crashpad_info.cc
+++ b/client/crashpad_info.cc
@@ -14,10 +14,14 @@
 
 #include "client/crashpad_info.h"
 
-#include <mach-o/loader.h>
-
 #include "util/stdlib/cxx.h"
 
+#if defined(OS_MAC)

[Mark Mentovai, 2014/12/15 23:38:34]

#include "build/build_config.h" to use this.

The correct macro is OS_MACOSX, not OS_MAC. Also below.

[scottmg, 2014/12/16 00:18:07]

Done. I'm unclear on the guidance for this. It must be directly included by this
file or its header? But base/basictypes.h being known to include it is
insufficient?
Oof. Done.

[Mark Mentovai, 2014/12/16 14:14:14]

scottmg wrote:
That’s right. We’re following “include what you use” strictly here.

In Chrome, it’s typically considered OK to rely on build/build_config.h being
available as a side effect of base/basictypes.h being included. In Crashpad, I’m
trying to be more explicit about things.

In fact, in today’s mini_chromium, there’s no reason that base/basictypes.h even
needs to include build/build_config.h at all.

+#include <mach-o/loader.h>
+#elif defined(OS_WIN)
+#include <windows.h>
+#endif
+
 #if CXX_LIBRARY_VERSION >= 2011
 #include <type_traits>
 #endif
@@ -45,6 +49,8 @@ union Compile_Assert {
 };
 #endif
 
+#if defined(OS_MAC)
+
 // Put the structure in __DATA,__crashpad_info where it can be easily found

[Mark Mentovai, 2014/12/15 23:38:34]

Aside from the actual section name, this comment’s not Mac-specific at all, and
doesn’t belong inside the #ifdef.

[scottmg, 2014/12/16 00:18:07]

Improved.

I removed the Windows pragmas for now as without testing them and writing the
thing that reads them they're not much use anyway.

 // without having to consult the symbol table. The “used” attribute prevents it
 // from being dead-stripped. This isn’t placed in an unnamed namespace:
@@ -60,6 +66,14 @@ __attribute__((section(SEG_DATA ",__crashpad_info"),
                used,
                visibility("hidden"))) CrashpadInfo g_crashpad_info;
 
+#elif defined(OS_WIN)
+
+#pragma data_seg(push, crashpad_info, "__crashpad_info")
+CrashpadInfo g_crashpad_info;
+#pragma data_seg(pop, crashpad_info)
+
+#endif
+
 // static
 CrashpadInfo* CrashpadInfo::GetCrashpadInfo() {
   return &g_crashpad_info;