[Mesa-dev] [PATCH 6/9] glapi: include generated headers without path

Dylan Baker dylan at pnwbakers.com
Wed Oct 25 22:58:20 UTC 2017


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

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 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 df907ff9d6a..269adc7ea00 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 a6b2455f1d5..d3fd3f82dcd 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 13db310b303..2e130e63ebc 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 */
-- 
2.14.2



More information about the mesa-dev mailing list