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

Author: Dylan Baker <[email protected]>
Date:   Mon Oct 23 16:09:41 2017 -0700

glapi: include generated headers without path

This has been tested wtih make dist-check and with meson.

Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>

---

 src/mapi/glapi/glapi_dispatch.c | 2 +-
 src/mapi/glapi/glapi_getproc.c  | 4 ++--
 src/mapi/glapi/glapi_nop.c      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mapi/glapi/glapi_dispatch.c b/src/mapi/glapi/glapi_dispatch.c
index df907ff9d6..269adc7ea0 100644
--- a/src/mapi/glapi/glapi_dispatch.c
+++ b/src/mapi/glapi/glapi_dispatch.c
@@ -38,7 +38,7 @@
  */
 
 #include "glapi/glapi_priv.h"
-#include "glapi/glapitable.h"
+#include "glapitable.h"
 
 
 #if !(defined(USE_X86_ASM) || defined(USE_X86_64_ASM) || 
defined(USE_SPARC_ASM))
diff --git a/src/mapi/glapi/glapi_getproc.c b/src/mapi/glapi/glapi_getproc.c
index a6b2455f1d..d3fd3f82dc 100644
--- a/src/mapi/glapi/glapi_getproc.c
+++ b/src/mapi/glapi/glapi_getproc.c
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "glapi/glapi_priv.h"
-#include "glapi/glapitable.h"
+#include "glapitable.h"
 
 
 #define FIRST_DYNAMIC_OFFSET (sizeof(struct _glapi_table) / sizeof(void *))
@@ -49,7 +49,7 @@
 #if !defined(DISPATCH_FUNCTION_SIZE) 
 # define NEED_FUNCTION_POINTER
 #endif
-#include "glapi/glprocs.h"
+#include "glprocs.h"
 
 
 /**
diff --git a/src/mapi/glapi/glapi_nop.c b/src/mapi/glapi/glapi_nop.c
index 13db310b30..2e130e63eb 100644
--- a/src/mapi/glapi/glapi_nop.c
+++ b/src/mapi/glapi/glapi_nop.c
@@ -116,7 +116,7 @@ NoOpUnused(void)
 #define DISPATCH_TABLE_NAME __glapi_noop_table
 #define UNUSED_TABLE_NAME __unused_noop_functions
 
-#include "glapi/glapitemp.h"
+#include "glapitemp.h"
 
 
 /** Return pointer to new dispatch table filled with no-op functions */

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to