forgot to pull the publish_no_reverse change to the example.

[catta] / avahi-core / prioq.h

diff --git a/avahi-core/prioq.h b/avahi-core/prioq.h
index 66510713432b096c4ff33f137868647b529842c3..b3d31eb58b7316030664e3988e68c895f1c202fb 100644 (file)
--- a/avahi-core/prioq.h
+++ b/avahi-core/prioq.h
@@ -1,54 +1,47 @@
 #ifndef fooprioqhfoo
 #define fooprioqhfoo
 
-/* $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>
-
-struct _AvahiPrioQueue;
-typedef struct _AvahiPrioQueue AvahiPrioQueue;
+typedef struct AvahiPrioQueue AvahiPrioQueue;
+typedef struct AvahiPrioQueueNode AvahiPrioQueueNode;
 
-struct _AvahiPrioQueueNode;
-typedef struct _AvahiPrioQueueNode AvahiPrioQueueNode;
+typedef int (*AvahiPQCompareFunc)(const void* a, const void* b);
 
-struct _AvahiPrioQueue {
+struct AvahiPrioQueue {
     AvahiPrioQueueNode *root, *last;
-    
-    guint n_nodes;
-    gint (*compare) (gconstpointer a, gconstpointer b);
+    unsigned n_nodes;
+    AvahiPQCompareFunc compare;
 };
 
-struct _AvahiPrioQueueNode {
+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);