summaryrefslogtreecommitdiffstats
path: root/twin/compton-tde/common.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-01-17 13:09:45 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-01-17 13:09:45 -0600
commitda5cf5e5bf7685c31aaf40c3d45e50093b136f6b (patch)
treede7447806dec5abb6ba3bcf042d062201bc3ccbf /twin/compton-tde/common.h
parentbf0861baf08e739ab3721d642178dbab64015675 (diff)
parent65bc49312cf8e75bf5ae3290eef40a2ebe712e9c (diff)
downloadtdebase-da5cf5e5bf7685c31aaf40c3d45e50093b136f6b.tar.gz
tdebase-da5cf5e5bf7685c31aaf40c3d45e50093b136f6b.zip
Merge compton changes
Diffstat (limited to 'twin/compton-tde/common.h')
-rw-r--r--twin/compton-tde/common.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/twin/compton-tde/common.h b/twin/compton-tde/common.h
index 9ff5a2148..bcc2ad68b 100644
--- a/twin/compton-tde/common.h
+++ b/twin/compton-tde/common.h
@@ -142,8 +142,9 @@
#include <dbus/dbus.h>
#endif
-// libGL
#ifdef CONFIG_VSYNC_OPENGL
+
+// libGL
#if defined(CONFIG_VSYNC_OPENGL_GLSL) || defined(CONFIG_VSYNC_OPENGL_FBO)
#define GL_GLEXT_PROTOTYPES
#endif
@@ -160,6 +161,8 @@
#define GLX_BACK_BUFFER_AGE_EXT 0x20F4
#endif
+#endif
+
// === Macros ===
#define MSTR_(s) #s
@@ -2602,8 +2605,6 @@ c2_matchd(session_t *ps, win *w, const c2_lptr_t *condlst,
///@}
-#endif
-
/**
* @brief Dump the given data to a file.
*/