1 files changed, 7 insertions, 1 deletions
diff --git a/progs/trivial/tri.c b/progs/trivial/tri.c
index 12fa8d11b6..c75acb3a5a 100644
--- a/progs/trivial/tri.c
+++ b/progs/trivial/tri.c
@@ -33,6 +33,7 @@
 
 
 GLenum doubleBuffer = 1;
+int win;
 
 static void Init(void)
 {
@@ -59,6 +60,10 @@ static void Key(unsigned char key, int x, int y)
 
     switch (key) {
       case 27:
+<<<<<<< HEAD:progs/trivial/tri.c
+         glutDestroyWindow(win);
+=======
+>>>>>>> gallium-0.1:progs/trivial/tri.c
 	exit(0);
       default:
 	return;
@@ -120,7 +125,8 @@ int main(int argc, char **argv)
     type |= (doubleBuffer) ? GLUT_DOUBLE : GLUT_SINGLE;
     glutInitDisplayMode(type);
 
-    if (glutCreateWindow("First Tri") == GL_FALSE) {
+    win = glutCreateWindow("First Tri");
+    if (!win) {
 	exit(1);
     }