From 8b7dfa852626f73894763e278e365609e81f1220 Mon Sep 17 00:00:00 2001
From: Gareth Hughes <gareth@valinux.com>
Date: Fri, 23 Mar 2001 06:01:03 +0000
Subject: [PATCH] Remove compiler warnings about ASSERT_OUTSIDE_BEGIN_END()
 macro.

---
 src/mesa/main/mtypes.h | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index af3c3c9..dd21dc6 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1,4 +1,4 @@
-/* $Id: mtypes.h,v 1.28 2001/03/19 02:25:35 keithw Exp $ */
+/* $Id: mtypes.h,v 1.29 2001/03/23 06:01:03 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -1686,8 +1686,13 @@ do {								\
    }								\
 } while (0)
 
-#define ASSERT_OUTSIDE_BEGIN_END(ctx) \
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx,)
+#define ASSERT_OUTSIDE_BEGIN_END(ctx)				\
+do {								\
+   if (ctx->Driver.CurrentExecPrimitive != GL_POLYGON+1) {	\
+      _mesa_error( ctx, GL_INVALID_OPERATION, "begin/end" );	\
+      return;							\
+   }								\
+} while (0)
 
 #define ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx)	\
 do {						\
-- 
2.7.4