diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
index 7d125a127cb..bb872cf8ac1 100644
--- a/src/compiler/glsl/ast_to_hir.cpp
+++ b/src/compiler/glsl/ast_to_hir.cpp
@@ -4509,8 +4509,8 @@ get_variable_being_redeclared(ir_variable **var_ptr, YYLTYPE loc,
                              "gl_FragDepth: depth layout is declared here "
                              "as '%s, but it was previously declared as "
                              "'%s'",
-                             depth_layout_string(var->data.depth_layout),
-                             depth_layout_string(earlier->data.depth_layout));
+                             depth_layout_string((ir_depth_layout)var->data.depth_layout),
+                             depth_layout_string((ir_depth_layout)earlier->data.depth_layout));
       }
 
       earlier->data.depth_layout = var->data.depth_layout;
diff --git a/src/compiler/glsl/ir.h b/src/compiler/glsl/ir.h
index c02fd143736..b921714062b 100644
--- a/src/compiler/glsl/ir.h
+++ b/src/compiler/glsl/ir.h
@@ -825,7 +825,7 @@ public:
        * This is not equal to \c ir_depth_layout_none if and only if this
        * variable is \c gl_FragDepth and a layout qualifier is specified.
        */
-      ir_depth_layout depth_layout:3;
+      unsigned depth_layout:3; /*ir_depth_layout*/
 
       /**
        * Memory qualifiers.