[xiph-cvs] cvs commit: avl avl.c

[Brendan]

brendan     03/07/06 23:37:23

  Modified:    .        avl.c
  Log:
  MAX may be defined elsewhere

Revision  Changes    Path
1.7       +3 -3      avl/avl.c

Index: avl.c
===================================================================
RCS file: /usr/local/cvsroot/avl/avl.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -u -r1.6 -r1.7
--- avl.c	7 Jul 2003 01:40:08 -0000	1.6
+++ avl.c	7 Jul 2003 03:37:23 -0000	1.7
@@ -22,7 +22,7 @@
  *
  */
 
-/* $Id: avl.c,v 1.6 2003/07/07 01:40:08 brendan Exp $ */
+/* $Id: avl.c,v 1.7 2003/07/07 03:37:23 brendan Exp $ */
 
 /*
  * This is a fairly straightfoward translation of a prototype
@@ -976,7 +976,7 @@ avl_get_item_by_key_least (avl_tree * tr
   }
 }
 
-#define MAX(X, Y)  ((X) > (Y) ? (X) : (Y))
+#define AVL_MAX(X, Y)  ((X) > (Y) ? (X) : (Y))
 
 static long
 avl_verify_balance (avl_node * node)
@@ -994,7 +994,7 @@ avl_verify_balance (avl_node * node)
       fprintf (stderr, "unbalanced at node %d\n", (int) node->key);
       exit(1);
     }
-    return (1 + MAX (lh, rh));
+    return (1 + AVL_MAX (lh, rh));
   }
 }
     

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.