aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/node.cc3
-rw-r--r--src/node_os.cc9
2 files changed, 6 insertions, 6 deletions
diff --git a/src/node.cc b/src/node.cc
index a39459cf63..f8cd15b84e 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -1998,10 +1998,7 @@ static void OnFatalError(const char* location, const char* message) {
fprintf(stderr, "FATAL ERROR: %s\n", message);
}
fflush(stderr);
-#if defined(DEBUG)
abort();
-#endif
- exit(5);
}
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)) {