Merge branch 'master'

This commit is contained in:
David Capello 2016-03-04 15:44:04 -03:00
commit 75203037e2

View File

@ -11,7 +11,11 @@
#include "base/string.h"
#ifdef _WIN32
#define FSTREAM_PATH(path) (base::from_utf8(path).c_str())
#ifdef __MINGW32__
#define FSTREAM_PATH(path) (std::string(path).c_str())
#else
#define FSTREAM_PATH(path) (base::from_utf8(path).c_str())
#endif
#else
#define FSTREAM_PATH(path) (std::string(path).c_str())
#endif