silence a bunch of warnings

diff --git a/src/mesa/shader/shaderobjects_3dlabs.c b/src/mesa/shader/shaderobjects_3dlabs.c
index 6faed11..96f3824 100755 (executable)
--- a/src/mesa/shader/shaderobjects_3dlabs.c
+++ b/src/mesa/shader/shaderobjects_3dlabs.c
@@ -34,6 +34,7 @@
 #include "imports.h"\r
 #include "hash.h"\r
 #include "shaderobjects.h"\r
+#include "shaderobjects_3dlabs.h"\r
 \r
 #if USE_3DLABS_FRONTEND\r
 #include "slang_mesa.h"\r

diff --git a/src/mesa/shader/slang/slang_assemble.h b/src/mesa/shader/slang/slang_assemble.h
index ddb59f8..ed10054 100644 (file)
--- a/src/mesa/shader/slang/slang_assemble.h
+++ b/src/mesa/shader/slang/slang_assemble.h
@@ -31,6 +31,8 @@
 extern "C" {\r
 #endif\r
 \r
+struct slang_operation_;\r
+\r
 typedef enum slang_assembly_type_\r
 {\r
        /* core */\r

diff --git a/src/mesa/shader/slang/slang_compile_function.c b/src/mesa/shader/slang/slang_compile_function.c
index 50828d0..60d9e33 100644 (file)
--- a/src/mesa/shader/slang/slang_compile_function.c
+++ b/src/mesa/shader/slang/slang_compile_function.c
@@ -150,16 +150,16 @@ slang_function *slang_function_scope_find (slang_function_scope *funcs, slang_fu
 GLboolean _slang_build_export_code_table (slang_export_code_table *tbl, slang_function_scope *funs,\r
        slang_translation_unit *unit)\r
 {\r
-       slang_atom main;\r
+       slang_atom mainAtom;\r
        GLuint i;\r
 \r
-       main = slang_atom_pool_atom (tbl->atoms, "main");\r
-       if (main == SLANG_ATOM_NULL)\r
+       mainAtom = slang_atom_pool_atom (tbl->atoms, "main");\r
+       if (mainAtom == SLANG_ATOM_NULL)\r
                return GL_FALSE;\r
 \r
        for (i = 0; i < funs->num_functions; i++)\r
        {\r
-               if (funs->functions[i].header.a_name == main)\r
+               if (funs->functions[i].header.a_name == mainAtom)\r
                {\r
                        slang_function *fun = &funs->functions[i];\r
                        slang_export_code_entry *e;\r

diff --git a/src/mesa/shader/slang/slang_compile_function.h b/src/mesa/shader/slang/slang_compile_function.h
index 2ad1d05..0c88434 100644 (file)
--- a/src/mesa/shader/slang/slang_compile_function.h
+++ b/src/mesa/shader/slang/slang_compile_function.h
@@ -29,6 +29,8 @@
 extern "C" {\r
 #endif\r
 \r
+struct slang_translation_unit_;\r
+\r
 typedef enum slang_function_kind_\r
 {\r
        slang_func_ordinary,\r

diff --git a/src/mesa/shader/slang/slang_export.c b/src/mesa/shader/slang/slang_export.c
index ffc2ec9..43ce35d 100644 (file)
--- a/src/mesa/shader/slang/slang_export.c
+++ b/src/mesa/shader/slang/slang_export.c
@@ -125,13 +125,13 @@ slang_export_data_entry *slang_export_data_table_add (slang_export_data_table *s
  * slang_export_code_entry\r
  */\r
 \r
-GLvoid slang_export_code_entry_ctr (slang_export_code_entry *self)\r
+static GLvoid slang_export_code_entry_ctr (slang_export_code_entry *self)\r
 {\r
        self->name = SLANG_ATOM_NULL;\r
        self->address = ~0;\r
 }\r
 \r
-GLvoid slang_export_code_entry_dtr (slang_export_code_entry *self)\r
+static GLvoid slang_export_code_entry_dtr (slang_export_code_entry *self)\r
 {\r
 }\r
 \r

diff --git a/src/mesa/shader/slang/slang_link.h b/src/mesa/shader/slang/slang_link.h
index 2f4fd25..5f8c4e7 100644 (file)
--- a/src/mesa/shader/slang/slang_link.h
+++ b/src/mesa/shader/slang/slang_link.h
@@ -31,7 +31,7 @@
 extern "C" {\r
 #endif\r
 \r
-typedef enum\r
+enum\r
 {\r
        SLANG_UNIFORM_BINDING_VERTEX,\r
        SLANG_UNIFORM_BINDING_FRAGMENT,\r
@@ -63,7 +63,7 @@ typedef struct
        GLuint count;\r
 } slang_active_uniforms;\r
 \r
-typedef enum\r
+enum\r
 {\r
        SLANG_COMMON_FIXED_MODELVIEWMATRIX,\r
        SLANG_COMMON_FIXED_PROJECTIONMATRIX,\r
@@ -107,7 +107,7 @@ typedef enum
        SLANG_COMMON_FIXED_MAX\r
 };\r
 \r
-typedef enum\r
+enum\r
 {\r
        SLANG_VERTEX_FIXED_POSITION,\r
        SLANG_VERTEX_FIXED_POINTSIZE,\r
@@ -134,7 +134,7 @@ typedef enum
        SLANG_VERTEX_FIXED_MAX\r
 };\r
 \r
-typedef enum\r
+enum\r
 {\r
        SLANG_FRAGMENT_FIXED_FRAGCOORD,\r
        SLANG_FRAGMENT_FIXED_FRONTFACING,\r

diff --git a/src/mesa/shader/slang/slang_utility.h b/src/mesa/shader/slang/slang_utility.h
index b4bde3d..346ce6b 100644 (file)
--- a/src/mesa/shader/slang/slang_utility.h
+++ b/src/mesa/shader/slang/slang_utility.h
@@ -32,7 +32,7 @@ extern "C" {
 /* Compile-time assertions.  If the expression is zero, try to declare an\r
  * array of size [-1] to cause compilation error.\r
  */\r
-#define static_assert(expr) do { int _array[(expr) ? 1 : -1]; _array[0]; } while (0)\r
+#define static_assert(expr) do { int _array[(expr) ? 1 : -1]; (void) _array[0]; } while (0)\r
 \r
 #define slang_alloc_free(ptr) _mesa_free (ptr)\r
 #define slang_alloc_malloc(size) _mesa_malloc (size)\r