Merge branch 'master' into pipe-video

[mesa.git] / src / glu / sgi / libtess / priorityq.c

diff --git a/src/glu/sgi/libtess/priorityq.c b/src/glu/sgi/libtess/priorityq.c
index cd5843c8d1ff26ce2ce0a8e5de6013ebfda47568..c6b99cce55200f85daada9db4b01823964821f99 100644 (file)
--- a/src/glu/sgi/libtess/priorityq.c
+++ b/src/glu/sgi/libtess/priorityq.c
@@ -30,8 +30,6 @@
 /*
 ** Author: Eric Veach, July 1994.
 **
-** $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libtess/priorityq.c,v 1.1 2001/03/17 00:25:41 brianp Exp $
 */
 
 #include "gluos.h"
@@ -87,7 +85,7 @@ void pqDeletePriorityQ( PriorityQ *pq )
 
 #define LT(x,y)                (! LEQ(y,x))
 #define GT(x,y)                (! LEQ(x,y))
-#define Swap(a,b)      if(1){PQkey *tmp = *a; *a = *b; *b = tmp;}else
+#define Swap(a,b)      do{PQkey *tmp = *a; *a = *b; *b = tmp;}while(0)
 
 /* really __gl_pqSortInit */
 int pqInit( PriorityQ *pq )