1-mingw-portability.patch

diff --git a/src/processor/basic_source_line_resolver.cc b/src/processor/basic_source_line_resolver.cc
index 62aa413..b93c0bc 100644
--- a/src/processor/basic_source_line_resolver.cc
+++ b/src/processor/basic_source_line_resolver.cc
@@ -55,7 +55,7 @@ using std::make_pair;

 namespace google_breakpad {

-#ifdef _WIN32
+#if defined (_WIN32) && !defined (__MINGW32__)
 #define strtok_r strtok_s
 #define strtoull _strtoui64
 #endif
diff --git a/src/processor/binarystream.cc b/src/processor/binarystream.cc
index bf92225..69177c2 100644
--- a/src/processor/binarystream.cc
+++ b/src/processor/binarystream.cc
@@ -27,7 +27,11 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+#ifdef __MINGW32__
+#include <winsock.h>
+#else
 #include <arpa/inet.h>
+#endif
 #include <limits.h>

 #include <string>
diff --git a/src/processor/cfi_frame_info.cc b/src/processor/cfi_frame_info.cc
index 5106ba0..bcfb170 100644
--- a/src/processor/cfi_frame_info.cc
+++ b/src/processor/cfi_frame_info.cc
@@ -43,7 +43,7 @@

 namespace google_breakpad {

-#ifdef _WIN32
+#if defined (_WIN32) && !defined (__MINGW32__)
 #define strtok_r strtok_s
 #endif

diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc
index 08f6465..f241a4b 100644
--- a/src/processor/minidump.cc
+++ b/src/processor/minidump.cc
@@ -42,13 +42,14 @@
 #include <string.h>
 #include <time.h>

-#ifdef _WIN32
+#if defined (_WIN32) && !defined (__MINGW32__)
 #include <io.h>
 #define PRIx64 "llx"
 #define PRIx32 "lx"
 #define snprintf _snprintf
 #else  // _WIN32
 #include <unistd.h>
+#include <stdint.h>
 #endif  // _WIN32

 #include <fstream>
diff --git a/src/processor/tokenize.cc b/src/processor/tokenize.cc
index f468120..efa5355 100644
--- a/src/processor/tokenize.cc
+++ b/src/processor/tokenize.cc
@@ -36,7 +36,7 @@

 namespace google_breakpad {

-#ifdef _WIN32
+#if defined (_WIN32) && !defined (__MINGW32__)
 #define strtok_r strtok_s
 #endif