dri: Rework planar image interface

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

diff --git a/src/glu/sgi/libtess/mesh.c b/src/glu/sgi/libtess/mesh.c
index 2e962ed4375faf720c8f866fb5913b6f9af14928..36cb3a7be29aa637fa0adc4a6c69d9575b6a8a43 100644 (file)
--- a/src/glu/sgi/libtess/mesh.c
+++ b/src/glu/sgi/libtess/mesh.c
@@ -38,8 +38,12 @@
 #include "mesh.h"
 #include "memalloc.h"
 
+#ifndef TRUE
 #define TRUE 1
+#endif
+#ifndef FALSE
 #define FALSE 0
+#endif
 
 static GLUvertex *allocVertex()
 {
@@ -332,7 +336,6 @@ int __gl_meshSplice( GLUhalfEdge *eOrg, GLUhalfEdge *eDst )
     /* We are merging two disjoint vertices -- destroy eDst->Org */
     joiningVertices = TRUE;
     KillVertex( eDst->Org, eOrg->Org );
-    eDst->Org = NULL;
   }
   if( eDst->Lface != eOrg->Lface ) {
     /* We are connecting two disjoint loops -- destroy eDst->Lface */