X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fprioq-test.c;h=6d0fd62f35314eeebdca339442ecebb268c45f35;hb=ccfcd5c42c68752fbd6de318fe5ce4269f5a7c06;hp=d85a2221f6e32f0ee336ffd84250f70dba87650d;hpb=854f901f491ccda79aee11edc3d59109cb229d28;p=catta diff --git a/avahi-core/prioq-test.c b/avahi-core/prioq-test.c index d85a222..6d0fd62 100644 --- a/avahi-core/prioq-test.c +++ b/avahi-core/prioq-test.c @@ -1,18 +1,16 @@ -/* $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 @@ -32,8 +30,8 @@ #include "prioq.h" -#define POINTER_TO_INT(p) ((int) (p)) -#define INT_TO_POINTER(i) ((void*) (i)) +#define POINTER_TO_INT(p) ((int) (long) (p)) +#define INT_TO_POINTER(i) ((void*) (long) (i)) static int compare_int(const void* a, const void* b) { int i = POINTER_TO_INT(a), j = POINTER_TO_INT(b); @@ -69,7 +67,7 @@ static void rec(AvahiPrioQueueNode *n) { assert(n->parent->right == NULL); } - + if (n->parent) { int a = POINTER_TO_INT(n->parent->data), b = POINTER_TO_INT(n->data); if (a > b) { @@ -101,12 +99,12 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { assert(q->n_nodes == q2->n_nodes); printf("%i\n", POINTER_TO_INT(((AvahiPrioQueueNode*)q2->root->data)->data)); - + avahi_prio_queue_remove(q, q2->root->data); avahi_prio_queue_remove(q2, q2->root); } - + /* prev = 0; */ /* while (q->root) { */ /* int v = GPOINTER_TO_INT(q->root->data); */