Merge branch 'master' into feature/jsc-emscripten

This commit is contained in:
Syrus
2019-04-30 11:47:28 -07:00
10 changed files with 17 additions and 36 deletions

View File

@ -164,7 +164,7 @@ pub fn _system(_ctx: &mut Ctx, _one: i32) -> c_int {
debug!("emscripten::_system");
// TODO: May need to change this Em impl to a working version
eprintln!("Can't call external programs");
return EAGAIN;
EAGAIN
}
pub fn _popen(_ctx: &mut Ctx, _one: i32, _two: i32) -> c_int {

View File

@ -345,7 +345,7 @@ pub fn _strftime(
// pad for null?
let bytes = result_str.chars().count();
if bytes as u32 > maxsize {
return 0;
0
} else {
// write output string
for (i, c) in result_str.chars().enumerate() {