diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-13 14:56:12 -0800 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-13 14:56:12 -0800 |
| commit | 429b58701a452703a161ed5e875b07268c909873 (patch) | |
| tree | 05097712c83482cd68b55291396489cf8a03adba /src/node_os.cc | |
| parent | ec57ecc982df6d4677fc5a347738201effeae5d1 (diff) | |
| parent | 1b74892807887fe89828ab874e9ce6b2831e7d54 (diff) | |
| download | android-node-v8-429b58701a452703a161ed5e875b07268c909873.tar.gz android-node-v8-429b58701a452703a161ed5e875b07268c909873.tar.bz2 android-node-v8-429b58701a452703a161ed5e875b07268c909873.zip | |
Merge remote-tracking branch 'upstream/v0.10'
Conflicts:
deps/uv/ChangeLog
deps/uv/build.mk
deps/uv/src/version.c
deps/uv/test/test-ipc.c
deps/v8/src/objects.cc
src/node.cc
src/node_os.cc
Diffstat (limited to 'src/node_os.cc')
| -rw-r--r-- | src/node_os.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/node_os.cc b/src/node_os.cc index bed5a09b20..14dc6e088f 100644 --- a/src/node_os.cc +++ b/src/node_os.cc @@ -222,12 +222,15 @@ static void GetInterfaceAddresses(const FunctionCallbackInfo<Value>& args) { Local<Array> ifarr; int err = uv_interface_addresses(&interfaces, &count); - if (err) { - return ThrowUVException(err, "uv_interface_addresses"); - } ret = Object::New(); + if (err == UV_ENOSYS) { + args.GetReturnValue().Set(ret); + } else if (err) { + return ThrowUVException(err, "uv_interface_addresses"); + } + for (i = 0; i < count; i++) { name = OneByteString(node_isolate, interfaces[i].name); if (ret->Has(name)) { |