Changeset e6a78b9 in mainline for uspace/srv/net/inetsrv/addrobj.h

Timestamp:

2012-06-29T15:31:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c (diff), 0bbd13e (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/inetsrv/addrobj.h (moved) (moved from uspace/srv/net/inet/addrobj.h ) (2 diffs)

uspace/srv/net/inetsrv/addrobj.h

@@ -39 +39 @@
 
 #include <sys/types.h>
-#include "inet.h"
+#include "inetsrv.h"
 
 typedef enum {
@@ -50 +50 @@
 extern inet_addrobj_t *inet_addrobj_new(void);
 extern void inet_addrobj_delete(inet_addrobj_t *);
-extern void inet_addrobj_add(inet_addrobj_t *);
+extern int inet_addrobj_add(inet_addrobj_t *);
 extern void inet_addrobj_remove(inet_addrobj_t *);
 extern inet_addrobj_t *inet_addrobj_find(inet_addr_t *, inet_addrobj_find_t);