fix assorted g++ warnings

2 files changed, 7 insertions, 7 deletions

diff --git a/src/mesa/main/program.c b/src/mesa/main/program.c
index 546c0540032..9a081ece203 100644
--- a/src/mesa/main/program.c
+++ b/src/mesa/main/program.c
@@ -345,7 +345,7 @@ _mesa_add_state_reference(struct program_parameter_list *paramList,
    idx = add_parameter(paramList, "Some State", NULL, STATE);
 	
    for (a=0; a<6; a++)
-      paramList->Parameters[idx].StateIndexes[a] = stateTokens[a];
+      paramList->Parameters[idx].StateIndexes[a] = (enum state_index) stateTokens[a];
 
    return idx;
 }
diff --git a/src/mesa/main/program.h b/src/mesa/main/program.h
index 23807746a6a..3c2aa1cdac6 100644
--- a/src/mesa/main/program.h
+++ b/src/mesa/main/program.h
@@ -116,15 +116,15 @@ enum state_index {
    STATE_TEXGEN_OBJECT_R,
    STATE_TEXGEN_OBJECT_Q,
 
-	STATE_TEXENV_COLOR,
+   STATE_TEXENV_COLOR,
 	
-	STATE_DEPTH_RANGE,
+   STATE_DEPTH_RANGE,
 
-	STATE_VERTEX_PROGRAM,
-	STATE_FRAGMENT_PROGRAM,
+   STATE_VERTEX_PROGRAM,
+   STATE_FRAGMENT_PROGRAM,
 
-	STATE_ENV,
-	STATE_LOCAL
+   STATE_ENV,
+   STATE_LOCAL
 };