Mesa (master): loader: Stop using a local definition for an in-tree header

[GitLab Mirror]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Nov 15 13:50:48 2018 -0800

loader: Stop using a local definition for an in-tree header

I need other types from the header now, and "gl.h is big" is not a good
reason to duplicate definitions.

Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/loader/loader.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/loader/loader.c b/src/loader/loader.c
index 461f96aa6a..041a59212b 100644
--- a/src/loader/loader.c
+++ b/src/loader/loader.c
@@ -41,6 +41,8 @@
 #ifdef MAJOR_IN_SYSMACROS
 #include <sys/sysmacros.h>
 #endif
+#include <GL/gl.h>
+#include <GL/internal/dri_interface.h>
 #include "loader.h"
 
 #ifdef HAVE_LIBDRM
@@ -492,14 +494,6 @@ loader_set_logger(void (*logger)(int level, const char *fmt, ...))
    log_ = logger;
 }
 
-/* XXX: Local definition to avoid pulling the heavyweight GL/gl.h and
- * GL/internal/dri_interface.h
- */
-
-#ifndef __DRI_DRIVER_GET_EXTENSIONS
-#define __DRI_DRIVER_GET_EXTENSIONS "__driDriverGetExtensions"
-#endif
-
 char *
 loader_get_extensions_name(const char *driver_name)
 {