From ee2d76fe90b8748b265de8caa22421dc1be86856 Mon Sep 17 00:00:00 2001 From: "ted.mielczarek@gmail.com" Date: Thu, 20 Aug 2015 15:09:16 +0000 Subject: Don't use strtok_s for mingw builds R=ivanpe at https://codereview.chromium.org/1292503005/ git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1496 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/processor/basic_source_line_resolver.cc | 2 ++ src/processor/cfi_frame_info.cc | 2 +- src/processor/tokenize.cc | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/processor') diff --git a/src/processor/basic_source_line_resolver.cc b/src/processor/basic_source_line_resolver.cc index 62aa4138..10dcb276 100644 --- a/src/processor/basic_source_line_resolver.cc +++ b/src/processor/basic_source_line_resolver.cc @@ -56,7 +56,9 @@ using std::make_pair; namespace google_breakpad { #ifdef _WIN32 +#ifdef _MSC_VER #define strtok_r strtok_s +#endif #define strtoull _strtoui64 #endif diff --git a/src/processor/cfi_frame_info.cc b/src/processor/cfi_frame_info.cc index 5106ba09..0c4af7ba 100644 --- a/src/processor/cfi_frame_info.cc +++ b/src/processor/cfi_frame_info.cc @@ -43,7 +43,7 @@ namespace google_breakpad { -#ifdef _WIN32 +#ifdef _MSC_VER #define strtok_r strtok_s #endif diff --git a/src/processor/tokenize.cc b/src/processor/tokenize.cc index f468120c..8fce87a2 100644 --- a/src/processor/tokenize.cc +++ b/src/processor/tokenize.cc @@ -36,7 +36,7 @@ namespace google_breakpad { -#ifdef _WIN32 +#ifdef _MSC_VER #define strtok_r strtok_s #endif -- cgit v1.2.1