forward declare GLX typedefs to limit conflicts from glx.h

This commit is contained in:
Mike Morris
2015-02-10 10:53:44 -08:00
parent 80f1795b37
commit e8a2c39365
4 changed files with 14 additions and 7 deletions

View File

@@ -3,6 +3,10 @@
#include <cstring>
#include <stdexcept>
#if MBGL_USE_GLX
#include <GL/glx.h>
#endif
namespace mbgl {
HeadlessDisplay::HeadlessDisplay() {
@@ -52,7 +56,7 @@ HeadlessDisplay::HeadlessDisplay() {
// We're creating a dummy pbuffer anyway that we're not using.
static int pixelFormat[] = {
GLX_DRAWABLE_TYPE, GLX_PBUFFER_BIT,
0
None
};
int configs = 0;