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
This commit is contained in:
ted.mielczarek@gmail.com 2013-03-06 14:06:52 +00:00
parent aeffe1056f
commit 93a48343ee
7 changed files with 20 additions and 3 deletions

View File

@ -62,6 +62,7 @@
typedef unsigned __int8 uint8_t; typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t; typedef unsigned __int16 uint16_t;
typedef __int32 int32_t;
typedef unsigned __int32 uint32_t; typedef unsigned __int32 uint32_t;
typedef unsigned __int64 uint64_t; typedef unsigned __int64 uint64_t;
#endif #endif

View File

@ -54,6 +54,11 @@ using std::make_pair;
namespace google_breakpad { namespace google_breakpad {
#ifdef _WIN32
#define strtok_r strtok_s
#define strtoull _strtoui64
#endif
static const char *kWhitespace = " \r\n"; static const char *kWhitespace = " \r\n";
BasicSourceLineResolver::BasicSourceLineResolver() : BasicSourceLineResolver::BasicSourceLineResolver() :

View File

@ -43,6 +43,10 @@
namespace google_breakpad { namespace google_breakpad {
#ifdef _WIN32
#define strtok_r strtok_s
#endif
template<typename V> template<typename V>
bool CFIFrameInfo::FindCallerRegs(const RegisterValueMap<V> &registers, bool CFIFrameInfo::FindCallerRegs(const RegisterValueMap<V> &registers,
const MemoryRegion &memory, const MemoryRegion &memory,

View File

@ -37,15 +37,13 @@
#include <assert.h> #include <assert.h>
#include <fcntl.h> #include <fcntl.h>
#include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#ifdef _WIN32 #ifdef _WIN32
#include <io.h> #include <io.h>
#if _MSC_VER < 1600
typedef SSIZE_T ssize_t;
#endif
#define PRIx64 "llx" #define PRIx64 "llx"
#define PRIx32 "lx" #define PRIx32 "lx"
#define snprintf _snprintf #define snprintf _snprintf

View File

@ -43,6 +43,7 @@
#include <map> #include <map>
#include <string> #include <string>
#include "google_breakpad/common/breakpad_types.h"
#include "google_breakpad/processor/source_line_resolver_base.h" #include "google_breakpad/processor/source_line_resolver_base.h"
#include "google_breakpad/processor/stack_frame.h" #include "google_breakpad/processor/stack_frame.h"
#include "processor/cfi_frame_info.h" #include "processor/cfi_frame_info.h"

View File

@ -36,6 +36,10 @@
namespace google_breakpad { namespace google_breakpad {
#ifdef _WIN32
#define strtok_r strtok_s
#endif
using std::vector; using std::vector;
bool Tokenize(char *line, bool Tokenize(char *line,

View File

@ -51,6 +51,10 @@
namespace google_breakpad { namespace google_breakpad {
#ifdef _WIN32
#define strtoull _strtoui64
#endif
struct WindowsFrameInfo { struct WindowsFrameInfo {
public: public:
enum Validity { enum Validity {