diff options
Diffstat (limited to 'avahi-core')
-rw-r--r-- | avahi-core/announce.h | 2 | ||||
-rw-r--r-- | avahi-core/browse.h | 2 | ||||
-rw-r--r-- | avahi-core/cache.h | 2 | ||||
-rw-r--r-- | avahi-core/iface.h | 2 | ||||
-rw-r--r-- | avahi-core/llist.h | 71 | ||||
-rw-r--r-- | avahi-core/rrlist.c | 2 | ||||
-rw-r--r-- | avahi-core/server.h | 2 |
7 files changed, 6 insertions, 77 deletions
diff --git a/avahi-core/announce.h b/avahi-core/announce.h index 1cab21f..9aee574 100644 --- a/avahi-core/announce.h +++ b/avahi-core/announce.h @@ -26,7 +26,7 @@ typedef struct AvahiAnnouncement AvahiAnnouncement; -#include "llist.h" +#include <avahi-common/llist.h> #include "iface.h" #include "server.h" #include "timeeventq.h" diff --git a/avahi-core/browse.h b/avahi-core/browse.h index ac33c51..2c9a2ab 100644 --- a/avahi-core/browse.h +++ b/avahi-core/browse.h @@ -22,7 +22,7 @@ USA. ***/ -#include "llist.h" +#include <avahi-common/llist.h> #include "core.h" #include "timeeventq.h" #include "server.h" diff --git a/avahi-core/cache.h b/avahi-core/cache.h index b6e3e8a..de685f4 100644 --- a/avahi-core/cache.h +++ b/avahi-core/cache.h @@ -26,9 +26,9 @@ typedef struct AvahiCache AvahiCache; +#include <avahi-common/llist.h> #include "prioq.h" #include "server.h" -#include "llist.h" #include "timeeventq.h" typedef enum { diff --git a/avahi-core/iface.h b/avahi-core/iface.h index c5c3c61..cb76359 100644 --- a/avahi-core/iface.h +++ b/avahi-core/iface.h @@ -29,11 +29,11 @@ typedef struct AvahiInterfaceAddress AvahiInterfaceAddress; typedef struct AvahiInterface AvahiInterface; typedef struct AvahiHwInterface AvahiHwInterface; +#include <avahi-common/llist.h> #include "address.h" #include "server.h" #include "netlink.h" #include "cache.h" -#include "llist.h" #include "response-sched.h" #include "query-sched.h" #include "probe-sched.h" diff --git a/avahi-core/llist.h b/avahi-core/llist.h deleted file mode 100644 index 7c28f31..0000000 --- a/avahi-core/llist.h +++ /dev/null @@ -1,71 +0,0 @@ -#ifndef foollistfoo -#define foollistfoo - -/* $Id$ */ - -/*** - This file is part of avahi. - - avahi is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - avahi is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General - Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with avahi; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - USA. -***/ - -#include <glib.h> - -/* Some macros for maintaining doubly linked lists */ - -/* The head of the linked list. Use this in the structure that shall - * contain the head of the linked list */ -#define AVAHI_LLIST_HEAD(t,name) t *name - -/* The pointers in the linked list's items. Use this in the item structure */ -#define AVAHI_LLIST_FIELDS(t,name) t *name##_next, *name##_prev - -/* Initialize the list's head */ -#define AVAHI_LLIST_HEAD_INIT(t,head) do { (head) = NULL; } while(0) - -/* Initialize a list item */ -#define AVAHI_LLIST_INIT(t,name,item) do { \ - t *_item = (item); \ - g_assert(_item); \ - _item->name##_prev = _item->name##_next = NULL; \ - } while(0) - -/* Prepend an item to the list */ -#define AVAHI_LLIST_PREPEND(t,name,head,item) do { \ - t **_head = &(head), *_item = (item); \ - g_assert(_item); \ - if ((_item->name##_next = *_head)) \ - _item->name##_next->name##_prev = _item; \ - _item->name##_prev = NULL; \ - *_head = _item; \ - } while (0) - -/* Remove an item from the list */ -#define AVAHI_LLIST_REMOVE(t,name,head,item) do { \ - t **_head = &(head), *_item = (item); \ - g_assert(_item); \ - if (_item->name##_next) \ - _item->name##_next->name##_prev = _item->name##_prev; \ - if (_item->name##_prev) \ - _item->name##_prev->name##_next = _item->name##_next; \ - else {\ - g_assert(*_head == _item); \ - *_head = _item->name##_next; \ - } \ - _item->name##_next = _item->name##_prev = NULL; \ - } while(0) - -#endif diff --git a/avahi-core/rrlist.c b/avahi-core/rrlist.c index 51e700c..ce4640c 100644 --- a/avahi-core/rrlist.c +++ b/avahi-core/rrlist.c @@ -19,8 +19,8 @@ USA. ***/ +#include <avahi-common/llist.h> #include "rrlist.h" -#include "llist.h" typedef struct AvahiRecordListItem AvahiRecordListItem; diff --git a/avahi-core/server.h b/avahi-core/server.h index 6572fbb..5810dfa 100644 --- a/avahi-core/server.h +++ b/avahi-core/server.h @@ -22,10 +22,10 @@ USA. ***/ +#include <avahi-common/llist.h> #include "core.h" #include "iface.h" #include "prioq.h" -#include "llist.h" #include "timeeventq.h" #include "announce.h" #include "browse.h" |