Browse Source

Platform: undefine another conflicting macro.

pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
792198ae89
  1. 1
      src/Platform/GlxContextHandler.h
  2. 1
      src/Platform/WindowlessGlxApplication.h

1
src/Platform/GlxContextHandler.h

@ -22,6 +22,7 @@
#include "Magnum.h" #include "Magnum.h"
#include <GL/glx.h> #include <GL/glx.h>
/* undef Xlib nonsense to avoid conflicts */ /* undef Xlib nonsense to avoid conflicts */
#undef Complex
#undef None #undef None
#undef Always #undef Always

1
src/Platform/WindowlessGlxApplication.h

@ -24,6 +24,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
/* undef Xlib nonsense to avoid conflicts */ /* undef Xlib nonsense to avoid conflicts */
#undef Complex
#undef None #undef None
#undef Always #undef Always

Loading…
Cancel
Save