Myth/serial
1
0
Fork 0
mirror of https://github.com/wjwwood/serial.git synced 2026-01-22 19:54:57 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #55 from dawid-aurobit/mingw

Browse Source 
support for mingw (mxe.cc)
This commit is contained in:
William Woodall 2014-01-05 23:34:52 -08:00
commit 15d37ac3aa
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/serial_example.cc
View File

@ -55,7 +55,7 @@ int run(int argc, char **argv)
// Argument 2 is the baudrate // Argument 2 is the baudrate
unsigned long baud = 0; unsigned long baud = 0;
#ifdef WIN32 #if defined(WIN32) && !defined(__MINGW32__)
sscanf_s(argv[2], "%lu", &baud); sscanf_s(argv[2], "%lu", &baud);
#else #else
sscanf(argv[2], "%lu", &baud); sscanf(argv[2], "%lu", &baud);

2
include/serial/serial.h
View File

@ -650,7 +650,7 @@ public:
explicit IOException (std::string file, int line, int errnum) explicit IOException (std::string file, int line, int errnum)
: file_(file), line_(line), errno_(errnum) { : file_(file), line_(line), errno_(errnum) {
std::stringstream ss; std::stringstream ss;
#if defined(_WIN32) #if defined(_WIN32) && !defined(__MINGW32__)
char error_str [1024]; char error_str [1024];
strerror_s(error_str, 1024, errnum); strerror_s(error_str, 1024, errnum);
#else #else

4
src/serial.cc
View File

@ -3,6 +3,10 @@
# include <alloca.h> # include <alloca.h>
#endif #endif
#if defined (__MINGW32__)
# define alloca __builtin_alloca
#endif
#include "serial/serial.h" #include "serial/serial.h"
#ifdef _WIN32 #ifdef _WIN32