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

Timestamp:

2013-05-27T13:18:13Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f2c19b0

Parents:

d120133 (diff), c90aed4 (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 (moved) (moved from kernel/genarch/include/genarch/fb/logo-196x66.h ) (2 diffs)

uspace/srv/net/dnsrsrv/query.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2008 Martin Decky
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup genarch
+/** @addtogroup dnsres
  * @{
  */
-/** @file
+/**
+ * @file
  */
 
-#ifndef KERN_LOGO_196X66_H_
-#define KERN_LOGO_196X66_H_
+#ifndef QUERY_H
+#define QUERY_H
 
-#define LOGO_WIDTH   196
-#define LOGO_HEIGHT  66
-#define LOGO_COLOR   0xffffff
+#include "dns_type.h"
 
-#include <typedefs.h>
-
-extern uint32_t fb_logo[LOGO_WIDTH * LOGO_HEIGHT];
+extern int dns_name2host(const char *, dns_host_info_t **);
+extern void dns_hostinfo_destroy(dns_host_info_t *);
 
 #endif