[Mesa-dev] [PATCH 2/9] dispatch: Include glheader.h in dispatch-related files.

[Paul Berry]

This ensures that GLES1-only typedefs are available in these files.
In a future patch, this will allow us to expand the dispatch table to
include GLES1-only functions.
---
 src/glx/tests/indirect_api.cpp              | 2 +-
 src/mapi/glapi/gen/gl_gentable.py           | 2 +-
 src/mapi/glapi/tests/check_table.cpp        | 2 +-
 src/mapi/shared-glapi/tests/check_table.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/glx/tests/indirect_api.cpp b/src/glx/tests/indirect_api.cpp
index a9759e1..af9eca5 100644
--- a/src/glx/tests/indirect_api.cpp
+++ b/src/glx/tests/indirect_api.cpp
@@ -44,7 +44,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <GL/gl.h>
+#include "main/glheader.h"
 extern "C" {
 #include "../indirect_init.h"
 #include "glapi/glapi.h"
diff --git a/src/mapi/glapi/gen/gl_gentable.py b/src/mapi/glapi/gen/gl_gentable.py
index b090132..a00c9c2 100644
--- a/src/mapi/glapi/gen/gl_gentable.py
+++ b/src/mapi/glapi/gen/gl_gentable.py
@@ -54,7 +54,7 @@ header = """/* GLXEXT is the define used in the xserver when the GLX extension i
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <GL/gl.h>
+#include "main/glheader.h"
 
 #include "glapi.h"
 #include "glapitable.h"
diff --git a/src/mapi/glapi/tests/check_table.cpp b/src/mapi/glapi/tests/check_table.cpp
index dd029c2..807d3c3 100644
--- a/src/mapi/glapi/tests/check_table.cpp
+++ b/src/mapi/glapi/tests/check_table.cpp
@@ -22,7 +22,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <GL/gl.h>
+#include "../mesa/main/glheader.h"
 
 extern "C" {
 #include "glapi/glapi.h"
diff --git a/src/mapi/shared-glapi/tests/check_table.cpp b/src/mapi/shared-glapi/tests/check_table.cpp
index 3252b35..47c0b27 100644
--- a/src/mapi/shared-glapi/tests/check_table.cpp
+++ b/src/mapi/shared-glapi/tests/check_table.cpp
@@ -22,7 +22,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <GL/gl.h>
+#include "../../../mesa/main/glheader.h"
 
 extern "C" {
 #include "glapi/glapi.h"
-- 
1.7.12.4