#include <map>
#include <sstream>
-using std::string;
-using std::vector;
-
+using namespace std;
namespace lyx {
namespace support {
string const encoded = to_local8bit(from_utf8(value));
#if defined (HAVE_SETENV)
return ::setenv(name.c_str(), encoded.c_str(), true);
-
#elif defined (HAVE_PUTENV)
- static std::map<string, char *> varmap;
-
- string envstr = name + '=' + encoded;
- char * newptr = new char[envstr.size() + 1];
- envstr.copy(newptr, envstr.length());
- newptr[envstr.length()] = '\0';
- int const retval = ::putenv(newptr);
-
- char * oldptr = varmap[name];
- if (oldptr)
- delete oldptr;
- varmap[name] = newptr;
- return retval == 0;
-
+ static std::map<string, string> varmap;
+ varmap[name] = name + '=' + encoded;
+ return ::putenv(const_cast<char*>(varmap[name].c_str())) == 0;
#else
#error No environment-setting function has been defined.
#endif