mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-10 20:04:46 +00:00
thinko
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20891 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
264a3d1cb4
commit
a4afd7b7e9
@ -60,11 +60,12 @@ bool setEnv(string const & name, string const & value)
|
|||||||
// CHECK Look at and fix this.
|
// CHECK Look at and fix this.
|
||||||
// f.ex. what about error checking?
|
// f.ex. what about error checking?
|
||||||
|
|
||||||
string const encoded(to_local8bit(from_utf8(value)));
|
string const encoded = to_local8bit(from_utf8(value));
|
||||||
#if defined (HAVE_SETENV)
|
#if defined (HAVE_SETENV)
|
||||||
int const retval = ::setenv(name.c_str(), encoded.c_str(), true);
|
return ::setenv(name.c_str(), encoded.c_str(), true) == 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
#elif defined (HAVE_PUTENV)
|
#if defined (HAVE_PUTENV)
|
||||||
static std::map<string, char *> varmap;
|
static std::map<string, char *> varmap;
|
||||||
|
|
||||||
string envstr = name + '=' + encoded;
|
string envstr = name + '=' + encoded;
|
||||||
@ -77,11 +78,13 @@ bool setEnv(string const & name, string const & value)
|
|||||||
if (oldptr)
|
if (oldptr)
|
||||||
delete oldptr;
|
delete oldptr;
|
||||||
varmap[name] = newptr;
|
varmap[name] = newptr;
|
||||||
|
return retval == 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
#else
|
#if !(defined HAVE_SETENV) && !(defined HAVE_PUTENV)
|
||||||
#error No environment-setting function has been defined.
|
#error No environment-setting function has been defined.
|
||||||
#endif
|
#endif
|
||||||
return retval == 0;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user