From 780f76c40d31e1c8f96d608ee19edb586d615363 Mon Sep 17 00:00:00 2001 From: dawid Date: Thu, 2 Jan 2014 19:47:39 +0100 Subject: [PATCH] support for mingw (mxe.cc) --- examples/serial_example.cc | 2 +- include/serial/serial.h | 2 +- src/serial.cc | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/examples/serial_example.cc b/examples/serial_example.cc index 59d8f7c..d2b922c 100644 --- a/examples/serial_example.cc +++ b/examples/serial_example.cc @@ -55,7 +55,7 @@ int run(int argc, char **argv) // Argument 2 is the baudrate unsigned long baud = 0; -#ifdef WIN32 +#if defined(WIN32) && !defined(__MINGW32__) sscanf_s(argv[2], "%lu", &baud); #else sscanf(argv[2], "%lu", &baud); diff --git a/include/serial/serial.h b/include/serial/serial.h index 2a915d9..25a9eb8 100644 --- a/include/serial/serial.h +++ b/include/serial/serial.h @@ -650,7 +650,7 @@ public: explicit IOException (std::string file, int line, int errnum) : file_(file), line_(line), errno_(errnum) { std::stringstream ss; -#if defined(_WIN32) +#if defined(_WIN32) && !defined(__MINGW32__) char error_str [1024]; strerror_s(error_str, 1024, errnum); #else diff --git a/src/serial.cc b/src/serial.cc index a247841..ec7d7c3 100755 --- a/src/serial.cc +++ b/src/serial.cc @@ -3,6 +3,10 @@ # include #endif +#if defined (__MINGW32__) +# define alloca __builtin_alloca +#endif + #include "serial/serial.h" #ifdef _WIN32