silence a variety of compiler warnings

diff --git a/src/mesa/shader/slang/slang_assemble.c b/src/mesa/shader/slang/slang_assemble.c
index 6c05e71..2e1e13d 100644 (file)
--- 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);\r
                return GL_FALSE;\r
        }\r
-       if (ti.spec.type != slang_spec_void)\r
-               if (A->ref == slang_ref_force)\r
+       if (ti.spec.type != slang_spec_void) {\r
+               if (A->ref == slang_ref_force) {\r
                        size = 4;\r
+               }\r
                else if (!sizeof_variable (A, &ti.spec, slang_qual_none, 0, &size))\r
                {\r
                        slang_assembly_typeinfo_destruct (&ti);\r
                        return GL_FALSE;\r
                }\r
+       }\r
        slang_assembly_typeinfo_destruct (&ti);\r
 \r
        /* if nonzero, free it from the stack */\r

diff --git a/src/mesa/shader/slang/slang_export.c b/src/mesa/shader/slang/slang_export.c
index 324dee2..8103994 100644 (file)
--- 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
 {\r
        GLuint i;\r
 \r
-       if (name[0] >= 'a' && name[0] <= 'z' || name[0] >= 'A' && name[0] <= 'Z' || name[0] == '_')\r
+       if ((name[0] >= 'a' && name[0] <= 'z') || (name[0] >= 'A' && name[0] <= 'Z') || name[0] == '_')\r
        {\r
                parsed[0] = name[0];\r
 \r
                for (i = 1; i < EXTRACT_MAXLEN; i++)\r
                {\r
-                       if (name[i] >= 'a' && name[i] <= 'z' || name[i] >= 'A' && name[i] <= 'Z' ||\r
-                               name[i] >= '0' && name[i] <= '9' || name[0] == '_')\r
+                       if ((name[i] >= 'a' && name[i] <= 'z') || (name[i] >= 'A' && name[i] <= 'Z') ||\r
+                               (name[i] >= '0' && name[i] <= '9') || name[0] == '_')\r
                        {\r
                                parsed[i] = name[i];\r
                        }\r

diff --git a/src/mesa/shader/slang/slang_library_noise.c b/src/mesa/shader/slang/slang_library_noise.c
index 05c6906..4dddf33 100644 (file)
--- a/src/mesa/shader/slang/slang_library_noise.c
+++ b/src/mesa/shader/slang/slang_library_noise.c
@@ -23,6 +23,7 @@
  */\r
 \r
 #include "imports.h"\r
+#include "slang_library_noise.h"\r
 \r
 /*\r
  * SimplexNoise1234\r

diff --git a/src/mesa/shader/slang/slang_storage.h b/src/mesa/shader/slang/slang_storage.h
index 2a1ddff..1815688 100644 (file)
--- 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 *);