Menu
▾
▴
[E] /hgroot/enblend/enblend: Fixes compilation on Windows
|
From: Enblend <enb...@li...> - 2012-02-11 08:50:27
|
branch: details: http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/hgroot/enblend/enblend/rev/e5f909929b33 changeset: 786:e5f909929b33 user: tmodes date: Sat Feb 11 09:50:56 2012 +0100 description: Fixes compilation on Windows diffstat: VERSION | 2 +- src/enblend.cc | 8 ++++---- src/enfuse.cc | 8 ++++---- src/fixmath.h | 3 +++ 4 files changed, 12 insertions(+), 9 deletions(-) diffs (97 lines): diff -r aae9827981b8 -r e5f909929b33 VERSION --- a/VERSION Sat Feb 11 09:50:17 2012 +0100 +++ b/VERSION Sat Feb 11 09:50:56 2012 +0100 @@ -1,1 +1,1 @@ -4.1-512cfd7364a4 +4.1-aae9827981b8 diff -r aae9827981b8 -r e5f909929b33 src/enblend.cc --- a/src/enblend.cc Sat Feb 11 09:50:17 2012 +0100 +++ b/src/enblend.cc Sat Feb 11 09:50:56 2012 +0100 @@ -1538,7 +1538,7 @@ boost::scoped_ptr<char> s(new char[strlen(optarg) + 1]); strcpy(s.get(), optarg); char* save_ptr = NULL; - char* token = strtok_r(s.get(), NUMERIC_OPTION_DELIMITERS, &save_ptr); + char* token = enblend::strtoken_r(s.get(), NUMERIC_OPTION_DELIMITERS, &save_ptr); while (token != NULL) { std::string key; @@ -1561,7 +1561,7 @@ "\" is not a valid identifier; ignoring\n"; } - token = strtok_r(NULL, NUMERIC_OPTION_DELIMITERS, &save_ptr); + token = enblend::strtoken_r(NULL, NUMERIC_OPTION_DELIMITERS, &save_ptr); } break; @@ -1571,7 +1571,7 @@ boost::scoped_ptr<char> s(new char[strlen(optarg) + 1]); strcpy(s.get(), optarg); char* save_ptr = NULL; - char* token = strtok_r(s.get(), NUMERIC_OPTION_DELIMITERS, &save_ptr); + char* token = enblend::strtoken_r(s.get(), NUMERIC_OPTION_DELIMITERS, &save_ptr); while (token != NULL) { std::string key(token); @@ -1586,7 +1586,7 @@ "\" is not a valid identifier; ignoring\n"; } - token = strtok_r(NULL, NUMERIC_OPTION_DELIMITERS, &save_ptr); + token = enblend::strtoken_r(NULL, NUMERIC_OPTION_DELIMITERS, &save_ptr); } break; diff -r aae9827981b8 -r e5f909929b33 src/enfuse.cc --- a/src/enfuse.cc Sat Feb 11 09:50:17 2012 +0100 +++ b/src/enfuse.cc Sat Feb 11 09:50:56 2012 +0100 @@ -1515,7 +1515,7 @@ boost::scoped_ptr<char> s(new char[strlen(optarg) + 1]); strcpy(s.get(), optarg); char* save_ptr = NULL; - char* token = strtok_r(s.get(), NUMERIC_OPTION_DELIMITERS, &save_ptr); + char* token = enblend::strtoken_r(s.get(), NUMERIC_OPTION_DELIMITERS, &save_ptr); while (token != NULL) { std::string key; @@ -1538,7 +1538,7 @@ "\" is not a valid identifier; ignoring\n"; } - token = strtok_r(NULL, NUMERIC_OPTION_DELIMITERS, &save_ptr); + token = enblend::strtoken_r(NULL, NUMERIC_OPTION_DELIMITERS, &save_ptr); } break; @@ -1548,7 +1548,7 @@ boost::scoped_ptr<char> s(new char[strlen(optarg) + 1]); strcpy(s.get(), optarg); char* save_ptr = NULL; - char* token = strtok_r(s.get(), NUMERIC_OPTION_DELIMITERS, &save_ptr); + char* token = enblend::strtoken_r(s.get(), NUMERIC_OPTION_DELIMITERS, &save_ptr); while (token != NULL) { std::string key(token); @@ -1563,7 +1563,7 @@ "\" is not a valid identifier; ignoring\n"; } - token = strtok_r(NULL, NUMERIC_OPTION_DELIMITERS, &save_ptr); + token = enblend::strtoken_r(NULL, NUMERIC_OPTION_DELIMITERS, &save_ptr); } break; diff -r aae9827981b8 -r e5f909929b33 src/fixmath.h --- a/src/fixmath.h Sat Feb 11 09:50:17 2012 +0100 +++ b/src/fixmath.h Sat Feb 11 09:50:56 2012 +0100 @@ -32,6 +32,9 @@ #ifdef _WIN32 #include <boost/math/special_functions.hpp> using namespace boost::math; +#ifdef __MINGW32__ +#include <pthread.h> // for rand_r +#endif #endif #include "vigra/basicimage.hxx" |