mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 12:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Window/Unix: Fix compilation with glxext header versions >=20180525

Browse Source 
When mesa updated their headers, they changed the include guard
from __glxext_h_ to __glx_glxext_h_, which breaks compilation
due to conflicting declarations. This commit modifies the preprocessor
directives to allow for compilation with older and newer mesa header
versions.
Fixes: #1472
This commit is contained in:
Christian Widmer 2018-08-16 02:04:12 +02:00 committed by Lukas Dürrenberger
parent e4d3a536a2
commit 53e1bae7ce
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/SFML/Window/Unix/GlxExtensions.hpp
View File

@ -25,11 +25,12 @@
#ifndef SF_POINTER_C_GENERATED_HEADER_GLXWIN_HPP #ifndef SF_POINTER_C_GENERATED_HEADER_GLXWIN_HPP
#define SF_POINTER_C_GENERATED_HEADER_GLXWIN_HPP #define SF_POINTER_C_GENERATED_HEADER_GLXWIN_HPP
#ifdef __glxext_h_ #if defined(__glxext_h_) || defined(__glx_glxext_h_)
#error Attempt to include glx_exts after including glxext.h #error Attempt to include glx_exts after including glxext.h
#endif #endif
#define __glxext_h_ #define __glxext_h_
#define __glx_glxext_h_
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>