From 4f8b59d59b5500d1e025bbd07dbab74158f193c8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 22 Feb 2006 16:35:34 +0000
Subject: [PATCH] silence a variety of compiler warnings

---
 src/mesa/shader/slang/slang_assemble.c      | 6 ++++--
 src/mesa/shader/slang/slang_export.c        | 6 +++---
 src/mesa/shader/slang/slang_library_noise.c | 1 +
 src/mesa/shader/slang/slang_storage.h       | 2 ++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/mesa/shader/slang/slang_assemble.c b/src/mesa/shader/slang/slang_assemble.c
index 6c05e71b8bd..2e1e13d1f5d 100644
--- a/src/mesa/shader/slang/slang_assemble.c
+++ b/src/mesa/shader/slang/slang_assemble.c
@@ -376,14 +376,16 @@ GLboolean _slang_cleanup_stack (slang_assemble_ctx *A, slang_operation *op)
 		slang_assembly_typeinfo_destruct (&ti);
 		return GL_FALSE;
 	}
-	if (ti.spec.type != slang_spec_void)
-		if (A->ref == slang_ref_force)
+	if (ti.spec.type != slang_spec_void) {
+		if (A->ref == slang_ref_force) {
 			size = 4;
+		}
 		else if (!sizeof_variable (A, &ti.spec, slang_qual_none, 0, &size))
 		{
 			slang_assembly_typeinfo_destruct (&ti);
 			return GL_FALSE;
 		}
+	}
 	slang_assembly_typeinfo_destruct (&ti);
 
 	/* if nonzero, free it from the stack */
diff --git a/src/mesa/shader/slang/slang_export.c b/src/mesa/shader/slang/slang_export.c
index 324dee2a407..8103994336c 100644
--- a/src/mesa/shader/slang/slang_export.c
+++ b/src/mesa/shader/slang/slang_export.c
@@ -138,14 +138,14 @@ static GLuint extract_name (const char *name, char *parsed, GLuint *element, con
 {
 	GLuint i;
 
-	if (name[0] >= 'a' && name[0] <= 'z' || name[0] >= 'A' && name[0] <= 'Z' || name[0] == '_')
+	if ((name[0] >= 'a' && name[0] <= 'z') || (name[0] >= 'A' && name[0] <= 'Z') || name[0] == '_')
 	{
 		parsed[0] = name[0];
 
 		for (i = 1; i < EXTRACT_MAXLEN; i++)
 		{
-			if (name[i] >= 'a' && name[i] <= 'z' || name[i] >= 'A' && name[i] <= 'Z' ||
-				name[i] >= '0' && name[i] <= '9' || name[0] == '_')
+			if ((name[i] >= 'a' && name[i] <= 'z') || (name[i] >= 'A' && name[i] <= 'Z') ||
+				(name[i] >= '0' && name[i] <= '9') || name[0] == '_')
 			{
 				parsed[i] = name[i];
 			}
diff --git a/src/mesa/shader/slang/slang_library_noise.c b/src/mesa/shader/slang/slang_library_noise.c
index 05c6906d514..4dddf33e724 100644
--- a/src/mesa/shader/slang/slang_library_noise.c
+++ b/src/mesa/shader/slang/slang_library_noise.c
@@ -23,6 +23,7 @@
  */
 
 #include "imports.h"
+#include "slang_library_noise.h"
 
 /*
  * SimplexNoise1234
diff --git a/src/mesa/shader/slang/slang_storage.h b/src/mesa/shader/slang/slang_storage.h
index 2a1ddffa0c2..1815688ff98 100644
--- a/src/mesa/shader/slang/slang_storage.h
+++ b/src/mesa/shader/slang/slang_storage.h
@@ -81,6 +81,8 @@ typedef struct slang_storage_aggregate_
 	GLuint count;
 } slang_storage_aggregate;
 
+struct slang_assembly_name_space_;
+
 GLboolean slang_storage_aggregate_construct (slang_storage_aggregate *);
 GLvoid slang_storage_aggregate_destruct (slang_storage_aggregate *);
 
-- 
2.30.2