aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwin Jansen <jansene@google.com>2019-02-21 10:17:52 -0800
committerErwin Jansen <jansene@google.com>2019-02-21 10:51:48 -0800
commitd84c576a8ec22978252e8875268882b2f929dc0f (patch)
tree26417817474b45efaac78da3360f5971a54f6518
parent0cc9f3fe66ab80e35bcd7fdf50cc035bd623c037 (diff)
downloadgoogle-breakpad-emu-29.0-release.tar.gz
Windows msvc compile fixes for minidump_dump & stackwalkemu-29.0-release
The android emulator provides a set of compatibility libraries that we can use to enable msvc compilation. Change-Id: I2e5d025c0f46ed04a851870e82032e4237390d47
-rw-r--r--src/processor/minidump_dump.cc5
-rw-r--r--src/processor/minidump_stackwalk.cc9
2 files changed, 12 insertions, 2 deletions
diff --git a/src/processor/minidump_dump.cc b/src/processor/minidump_dump.cc
index 4716aa08..b19ac2d4 100644
--- a/src/processor/minidump_dump.cc
+++ b/src/processor/minidump_dump.cc
@@ -34,7 +34,12 @@
#include <stdio.h>
#include <string.h>
+#ifdef _MSC_VER
+#include "msvc-posix.h"
+#include "msvc-getopt.h"
+#else
#include <unistd.h>
+#endif
#include "common/scoped_ptr.h"
#include "google_breakpad/processor/minidump.h"
diff --git a/src/processor/minidump_stackwalk.cc b/src/processor/minidump_stackwalk.cc
index acf80972..b2a81acc 100644
--- a/src/processor/minidump_stackwalk.cc
+++ b/src/processor/minidump_stackwalk.cc
@@ -34,7 +34,12 @@
#include <stdio.h>
#include <string.h>
-#include <unistd.h>
+#ifdef _MSC_VER
+#include "msvc-posix.h"
+#include "msvc-getopt.h"
+#else
+ #include <unistd.h>
+#endif
#include <limits>
#include <string>
@@ -129,7 +134,7 @@ static void Usage(int argc, const char *argv[], bool error) {
"\n"
" -m Output in machine-readable format\n"
" -s Output stack contents\n",
- google_breakpad::BaseName(argv[0]).c_str());
+ argv[0]);
}
static void SetupOptions(int argc, const char *argv[], Options* options) {