aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-11-08 15:50:05 -0800
committerAlon Zakai <alonzakai@gmail.com>2013-11-08 15:50:05 -0800
commita11272805c16be75f5e6d00c8214afcac7ba9d05 (patch)
tree0051790b9c5698be93bb512f97c1d5f55ee9f574
parent128ea802e3ec1268b6a934373f2b45d37c6f501f (diff)
parent18036a4d2f9e41220444f45295097733b0c1863a (diff)
Merge branch 'master' of github.com:bobroberts177/emscripten into incoming
-rw-r--r--AUTHORS2
-rw-r--r--src/library.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 5c49e65e..0b8fdf33 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -106,4 +106,4 @@ a license to everyone to use it as detailed in LICENSE.)
* Fraser Adams <fraser.adams@blueyonder.co.uk>
* Michael Tirado <icetooth333@gmail.com>
* Ben Noordhuis <info@bnoordhuis.nl>
-
+* Bob Roberts <bobroberts177@gmail.com>
diff --git a/src/library.js b/src/library.js
index e244491b..31f531e9 100644
--- a/src/library.js
+++ b/src/library.js
@@ -7335,6 +7335,7 @@ LibraryManager.library = {
// we're generating fake IP addresses with lookup_name that we can
// resolve later on with lookup_addr.
// We do the aliasing in 172.29.*.*, giving us 65536 possibilities.
+ $DNS__deps: ['_inet_pton4_raw', '_inet_pton6_raw'],
$DNS: {
address_map: {
id: 1,
@@ -7342,7 +7343,6 @@ LibraryManager.library = {
names: {}
},
- lookup_name__deps: ['_inet_pton4_raw', '_inet_pton6_raw'],
lookup_name: function (name) {
// If the name is already a valid ipv4 / ipv6 address, don't generate a fake one.
var res = __inet_pton4_raw(name);