From: Emil Velikov <emil.velikov@collabora.com>
Date: Thu, 7 Dec 2017 17:07:37 +0000 (+0000)
Subject: mapi: remove non applicable HAVE_DIX_CONFIG_H hunk
X-Git-Tag: upstream/18.1.0~2335
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=647f40298aa877ccd65818e8fb4495fc9f9a2dce;p=platform%2Fupstream%2Fmesa.git

mapi: remove non applicable HAVE_DIX_CONFIG_H hunk

Seeming artefact from when the xserver build was diving directly into
mesa's tree.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mapi/glapi/glapi_priv.h b/src/mapi/glapi/glapi_priv.h
index 8f2c677..0e584f4 100644
--- a/src/mapi/glapi/glapi_priv.h
+++ b/src/mapi/glapi/glapi_priv.h
@@ -27,10 +27,6 @@
 #define _GLAPI_PRIV_H
 
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#include "glapi/mesa.h"
-#else /* HAVE_DIX_CONFIG_H */
 #define GL_GLEXT_PROTOTYPES
 #include "GL/gl.h"
 #include "GL/glext.h"
@@ -44,8 +40,6 @@ typedef int GLclampx;
 typedef void *GLeglImageOES;
 #endif
 
-#endif /* HAVE_DIX_CONFIG_H */
-
 #include "glapi/glapi.h"