Merge remote-tracking branch 'mesa-public/master' into vulkan

[mesa.git] / src / glsl / nir / glsl_types.cpp

diff --git a/src/glsl/nir/glsl_types.cpp b/src/glsl/nir/glsl_types.cpp
index 64b5c0cb106fc2db8cac67dbb16ab69270a2ea9f..bc8677ba6fc16c63f66a42dc9380f1de84bb3d51 100644 (file)
--- a/src/glsl/nir/glsl_types.cpp
+++ b/src/glsl/nir/glsl_types.cpp
@@ -22,7 +22,7 @@
  */
 
 #include <stdio.h>
-#include "main/core.h" /* for Elements, MAX2 */
+#include "main/macros.h"
 #include "glsl_parser_extras.h"
 #include "glsl_types.h"
 #include "util/hash_table.h"