commit 5b37c322741f019118a618bc6220f37adba4fbcd
author Brian Paul <brian.paul@tungstengraphics.com> Fri Nov 05 06:43:10 1999 +0000
committer Brian Paul <brian.paul@tungstengraphics.com> Fri Nov 05 06:43:10 1999 +0000
tree f3279be5226458b598e35fabbe98faf0d4ba8c36
parent 30990a65f8e1fd67d394f0b4a73956975a65a215

clean-up to reduce MSVC warnings

src/mesa/main/varray.c

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 29eb392..02aca61 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1,4 +1,4 @@
-/* $Id: varray.c,v 1.6 1999/11/04 19:42:28 keithw Exp $ */
+/* $Id: varray.c,v 1.7 1999/11/05 06:43:11 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -505,7 +505,7 @@
       struct immediate *IM = VB->IM;
       struct gl_client_array *client_data;
       struct gl_pipeline *elt = &ctx->CVA.elt;
-      GLuint relock;
+      GLboolean relock;
       GLuint fallback, required;
 
       if (ctx->NewState)
@@ -1226,7 +1226,7 @@
       return;
    }
 
-   if (!ctx->Array.LockCount && 2*count > 3*(end-start)) {
+   if (!ctx->Array.LockCount && 2*count > (GLint) 3*(end-start)) {
       glLockArraysEXT(CTX_PRM start, end );
       glDrawElements(CTX_PRM mode, count, type, indices );
       glUnlockArraysEXT(CTX_VPRM );