Mesa (master): glsl: Only include mtypes from glsl_types.h for the C++ code that needs it.

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 90b4bf2e6e1289442331f0368221fde69b60915f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=90b4bf2e6e1289442331f0368221fde69b60915f

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Feb 11 15:21:37 2015 -0800

glsl: Only include mtypes from glsl_types.h for the C++ code that needs it.

It's used in one of the methods, not in the structure definitions.

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>

---

 src/glsl/glsl_types.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h
index 5dc7e45..7359e94 100644
--- a/src/glsl/glsl_types.h
+++ b/src/glsl/glsl_types.h
@@ -28,7 +28,6 @@
 
 #include <string.h>
 #include <assert.h>
-#include "main/mtypes.h" /* for gl_texture_index, C++'s enum rules are broken */
 
 #ifdef __cplusplus
 extern "C" {
@@ -104,6 +103,7 @@ enum glsl_matrix_layout {
 #ifdef __cplusplus
 #include "GL/gl.h"
 #include "util/ralloc.h"
+#include "main/mtypes.h" /* for gl_texture_index, C++'s enum rules are broken */
 
 struct glsl_type {
    GLenum gl_type;