Merge branch 'Pr0curo-hotfix-1.1.3' into hotfix-1.1.3

This commit is contained in:
Jinhao 2015-09-26 11:23:27 +08:00
commit 5a8a4946aa

View File

@ -430,7 +430,8 @@ namespace nana {
delete[] p; delete[] p;
return s; return s;
} }
return buf; nana::string s = buf;
return s;
} }
#elif defined(NANA_LINUX) #elif defined(NANA_LINUX)
const char * s = ::getenv("PWD"); const char * s = ::getenv("PWD");