* strip glib from avahi-core

* implement glib memory allocator
* add new documentation file MALLOC
* initialize pseudo-RNG from /dev/urandom in avahi-daemon
* remove some gcc 4.0 warnings 
* beef up watch system with real timeouts
* move GCC __attribute__ macros into its own header avahi-common/gccmacro.h
* make use of GCC's sentinel attribute where it make sense
* add malloc() implementations that abort on OOM and enable them by default


git-svn-id: file:///home/lennart/svn/public/avahi/trunk@308 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

1 files changed, 8 insertions, 11 deletions

diff --git a/avahi-core/prioq.h b/avahi-core/prioq.h
index e6105d8..ace92f6 100644
--- a/avahi-core/prioq.h
+++ b/avahi-core/prioq.h
@@ -22,31 +22,28 @@
   USA.
 ***/
 
-#include <glib.h>
-
 typedef struct AvahiPrioQueue AvahiPrioQueue;
-
 typedef struct AvahiPrioQueueNode AvahiPrioQueueNode;
 
+typedef int (*AvahiPQCompareFunc)(const void* a, const void* b);
+
 struct AvahiPrioQueue {
     AvahiPrioQueueNode *root, *last;
-    
-    guint n_nodes;
-    gint (*compare) (gconstpointer a, gconstpointer b);
+    unsigned n_nodes;
+    AvahiPQCompareFunc compare;
 };
 
 struct AvahiPrioQueueNode {
     AvahiPrioQueue *queue;
-    gpointer data;
-    guint x, y;
-
+    void* data;
+    unsigned x, y;
     AvahiPrioQueueNode *left, *right, *parent, *next, *prev;
 };
 
-AvahiPrioQueue* avahi_prio_queue_new(gint (*compare) (gconstpointer a, gconstpointer b));
+AvahiPrioQueue* avahi_prio_queue_new(AvahiPQCompareFunc compare);
 void avahi_prio_queue_free(AvahiPrioQueue *q);
 
-AvahiPrioQueueNode* avahi_prio_queue_put(AvahiPrioQueue *q, gpointer data);
+AvahiPrioQueueNode* avahi_prio_queue_put(AvahiPrioQueue *q, void* data);
 void avahi_prio_queue_remove(AvahiPrioQueue *q, AvahiPrioQueueNode *n);
 
 void avahi_prio_queue_shuffle(AvahiPrioQueue *q, AvahiPrioQueueNode *n);