amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix environment variable setting on Windows (#674)

Browse source 
The previous way of checking that _putenv_s is defined does not work,
because _putenv_s is a function and not a define. This is a partial
application of commit 31115e0369747b1e1c45cbe3f2a90f6dff66666a from
alexrj/Slic3r.

I tried cherry picking the whole commit, but unicode is already handled
diffrently here, so that would have been a lot of work.
This commit is contained in:
fredizzimo 2018-01-07 23:20:02 +02:00 committed by bubnikv
parent fec1fcdca8
commit ad5fcce6e4
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xs/src/libslic3r/Config.cpp
View file

@ -18,10 +18,6 @@
#include <boost/property_tree/ini_parser.hpp> #include <boost/property_tree/ini_parser.hpp>
#include <string.h> #include <string.h>
#if defined(_WIN32) && !defined(setenv) && defined(_putenv_s)
#define setenv(k, v, o) _putenv_s(k, v)
#endif
namespace Slic3r { namespace Slic3r {
std::string escape_string_cstyle(const std::string &str) std::string escape_string_cstyle(const std::string &str)
@ -309,7 +305,6 @@ double ConfigBase::get_abs_value(const t_config_option_key &opt_key, double rati
void ConfigBase::setenv_() void ConfigBase::setenv_()
{ {
#ifdef setenv
t_config_option_keys opt_keys = this->keys(); t_config_option_keys opt_keys = this->keys();
for (t_config_option_keys::const_iterator it = opt_keys.begin(); it != opt_keys.end(); ++it) { for (t_config_option_keys::const_iterator it = opt_keys.begin(); it != opt_keys.end(); ++it) {
// prepend the SLIC3R_ prefix // prepend the SLIC3R_ prefix
@ -322,9 +317,8 @@ void ConfigBase::setenv_()
for (size_t i = 0; i < envname.size(); ++i) for (size_t i = 0; i < envname.size(); ++i)
envname[i] = (envname[i] <= 'z' && envname[i] >= 'a') ? envname[i]-('a'-'A') : envname[i]; envname[i] = (envname[i] <= 'z' && envname[i] >= 'a') ? envname[i]-('a'-'A') : envname[i];
setenv(envname.c_str(), this->serialize(*it).c_str(), 1); boost::nowide::setenv(envname.c_str(), this->serialize(*it).c_str(), 1);
} }
#endif
} }
void ConfigBase::load(const std::string &file) void ConfigBase::load(const std::string &file)