Mesa (master): mapi: remove non applicable HAVE_DIX_CONFIG_H hunk
Emil Velikov
evelikov at kemper.freedesktop.org
Thu Jan 25 18:43:43 UTC 2018
Module: Mesa
Branch: master
Commit: 647f40298aa877ccd65818e8fb4495fc9f9a2dce
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=647f40298aa877ccd65818e8fb4495fc9f9a2dce
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Thu Dec 7 17:07:37 2017 +0000
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 at collabora.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
src/mapi/glapi/glapi_priv.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/src/mapi/glapi/glapi_priv.h b/src/mapi/glapi/glapi_priv.h
index 8f2c6775dc..0e584f4be9 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"
More information about the mesa-commit
mailing list