Changeset c2a6983 in mainline for uspace/srv/net/dnsrsrv/query.h

Timestamp:

2013-10-13T20:59:33Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

12d6c98

Parents:

820104d (diff), 39bcc99 (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/srv/net/dnsrsrv/query.h (modified) (1 diff)

uspace/srv/net/dnsrsrv/query.h

@@ -37 +37 @@
 #define QUERY_H
 
+#include <inet/addr.h>
 #include "dns_type.h"
 
-extern int dns_name2host(const char *, dns_host_info_t **, uint16_t);
+extern int dns_name2host(const char *, dns_host_info_t **, ip_ver_t);
 extern void dns_hostinfo_destroy(dns_host_info_t *);