Changeset 0773396 in mainline for uspace/lib/c/generic/dnsr.c

Timestamp:

2013-12-25T13:05:25Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/lib/c/generic/dnsr.c (modified) (2 diffs)

uspace/lib/c/generic/dnsr.c

@@ -67 +67 @@
 }
 
-int dnsr_name2host(const char *name, dnsr_hostinfo_t **rinfo, uint16_t af)
+int dnsr_name2host(const char *name, dnsr_hostinfo_t **rinfo, ip_ver_t ver)
 {
         dnsr_hostinfo_t *info = calloc(1, sizeof(dnsr_hostinfo_t));
@@ -76 +76 @@
         
         ipc_call_t answer;
-        aid_t req = async_send_1(exch, DNSR_NAME2HOST, (sysarg_t) af,
+        aid_t req = async_send_1(exch, DNSR_NAME2HOST, (sysarg_t) ver,
             &answer);