From 93a48343eecb9a38c023b1e5d4fecb44c4655cb2 Mon Sep 17 00:00:00 2001
From: "ted.mielczarek@gmail.com"
 <ted.mielczarek@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>
Date: Wed, 6 Mar 2013 14:06:52 +0000
Subject: Fix some more Win32 compat issues in processor code R=mark at
 https://breakpad.appspot.com/535003/

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1122 4c0a9323-5329-0410-9bdc-e9ce6186880e
---
 src/google_breakpad/common/breakpad_types.h     | 1 +
 src/processor/basic_source_line_resolver.cc     | 5 +++++
 src/processor/cfi_frame_info.cc                 | 4 ++++
 src/processor/minidump.cc                       | 4 +---
 src/processor/source_line_resolver_base_types.h | 1 +
 src/processor/tokenize.cc                       | 4 ++++
 src/processor/windows_frame_info.h              | 4 ++++
 7 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/google_breakpad/common/breakpad_types.h b/src/google_breakpad/common/breakpad_types.h
index a6545be5..a60c5f35 100644
--- a/src/google_breakpad/common/breakpad_types.h
+++ b/src/google_breakpad/common/breakpad_types.h
@@ -62,6 +62,7 @@
 
 typedef unsigned __int8  uint8_t;
 typedef unsigned __int16 uint16_t;
+typedef __int32 int32_t;
 typedef unsigned __int32 uint32_t;
 typedef unsigned __int64 uint64_t;
 #endif
diff --git a/src/processor/basic_source_line_resolver.cc b/src/processor/basic_source_line_resolver.cc
index 2a93ee36..55f8f9a1 100644
--- a/src/processor/basic_source_line_resolver.cc
+++ b/src/processor/basic_source_line_resolver.cc
@@ -54,6 +54,11 @@ using std::make_pair;
 
 namespace google_breakpad {
 
+#ifdef _WIN32
+#define strtok_r strtok_s
+#define strtoull _strtoui64
+#endif
+
 static const char *kWhitespace = " \r\n";
 
 BasicSourceLineResolver::BasicSourceLineResolver() :
diff --git a/src/processor/cfi_frame_info.cc b/src/processor/cfi_frame_info.cc
index 881a2a7a..5106ba09 100644
--- a/src/processor/cfi_frame_info.cc
+++ b/src/processor/cfi_frame_info.cc
@@ -43,6 +43,10 @@
 
 namespace google_breakpad {
 
+#ifdef _WIN32
+#define strtok_r strtok_s
+#endif
+
 template<typename V>
 bool CFIFrameInfo::FindCallerRegs(const RegisterValueMap<V> &registers,
                                   const MemoryRegion &memory,
diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc
index e18a1675..43d22e61 100755
--- a/src/processor/minidump.cc
+++ b/src/processor/minidump.cc
@@ -37,15 +37,13 @@
 
 #include <assert.h>
 #include <fcntl.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
 
 #ifdef _WIN32
 #include <io.h>
-#if _MSC_VER < 1600
-typedef SSIZE_T ssize_t;
-#endif
 #define PRIx64 "llx"
 #define PRIx32 "lx"
 #define snprintf _snprintf
diff --git a/src/processor/source_line_resolver_base_types.h b/src/processor/source_line_resolver_base_types.h
index 5b099f1a..1dc3d62a 100644
--- a/src/processor/source_line_resolver_base_types.h
+++ b/src/processor/source_line_resolver_base_types.h
@@ -43,6 +43,7 @@
 #include <map>
 #include <string>
 
+#include "google_breakpad/common/breakpad_types.h"
 #include "google_breakpad/processor/source_line_resolver_base.h"
 #include "google_breakpad/processor/stack_frame.h"
 #include "processor/cfi_frame_info.h"
diff --git a/src/processor/tokenize.cc b/src/processor/tokenize.cc
index e398c528..a5b028e3 100644
--- a/src/processor/tokenize.cc
+++ b/src/processor/tokenize.cc
@@ -36,6 +36,10 @@
 
 namespace google_breakpad {
 
+#ifdef _WIN32
+#define strtok_r strtok_s
+#endif
+
 using std::vector;
 
 bool Tokenize(char *line,
diff --git a/src/processor/windows_frame_info.h b/src/processor/windows_frame_info.h
index 46e7bca0..c92c610c 100644
--- a/src/processor/windows_frame_info.h
+++ b/src/processor/windows_frame_info.h
@@ -51,6 +51,10 @@
 
 namespace google_breakpad {
 
+#ifdef _WIN32
+#define strtoull _strtoui64
+#endif
+
 struct WindowsFrameInfo {
  public:
   enum Validity {
-- 
cgit v1.2.1