Fixes compilation with Mesa >= 18.2.5. Taken from upstream: https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47 diff --git a/include/allegro5/allegro_opengl.h b/include/allegro5/allegro_opengl.h index 0f86a6768..652dd024e 100644 --- a/include/allegro5/allegro_opengl.h +++ b/include/allegro5/allegro_opengl.h @@ -103,10 +103,14 @@ /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ #define __glext_h_ +#define __gl_glext_h_ #define __glxext_h_ +#define __glx_glxext_h_ #include #undef __glext_h_ +#undef __gl_glext_h_ #undef __glxext_h_ +#undef __glx_glxext_h_ #endif /* ALLEGRO_MACOSX */ diff --git a/include/allegro5/opengl/GLext/glx_ext_defs.h b/include/allegro5/opengl/GLext/glx_ext_defs.h index 49c502091..fba8aea5d 100644 --- a/include/allegro5/opengl/GLext/glx_ext_defs.h +++ b/include/allegro5/opengl/GLext/glx_ext_defs.h @@ -1,7 +1,9 @@ /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ #define __glxext_h_ +#define __glx_glxext_h_ #include #undef __glxext_h_ +#undef __glx_glxext_h_ #ifndef GLX_VERSION_1_3 #define _ALLEGRO_GLX_VERSION_1_3 -- 2.20.0 1f35a4f7'>refslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2021-04-19 12:41:28 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2021-04-19 19:22:59 +0200
commit409e20a65c556cad85f132f02564fb9f1f35a4f7 (patch)
tree1611ee574b7617368eafb9b50c53e6e372ab7dd3 /gnu/packages/monitoring.scm
parentd3480fbfaf2a4fc61360e09bbbfe4136271ae7e4 (diff)
downloadguix-409e20a65c556cad85f132f02564fb9f1f35a4f7.tar.gz
guix-409e20a65c556cad85f132f02564fb9f1f35a4f7.zip
gnu: inxi-minimal: Update to 3.3.04-1.
* gnu/packages/admin.scm (inxi-minimal): Update to 3.3.04-1.
Diffstat (limited to 'gnu/packages/monitoring.scm')
0 files changed, 0 insertions, 0 deletions