Merge lp:~asac/clutk/prepare-no-gl-includes-in-clutter into lp:clutk

[Alexander Sack]

.c files that use GL_ symbols should not rely on those getting included implicitly by an external lib.

This patch fixes ctk-menu.c and ctk-menu-expandable.c for cases where clutter headers don't include GL/gl.h (e.g. linaro work to make clutter frontend api GL flavour agnostic)

[Andrea Cimitan (cimi)]

I don't think we need this anymore, as clutk looks abandoned to me

review: Abstain

[Andrea Cimitan (cimi)]

review: Needs Information

Unmerged revisions

259. By Alexander Sack on 2010-10-04

fix missing gl includes; do not rely on GL/gl.h getting included by clutter

=== modified file 'clutk/ctk-menu-expandable.c'
--- clutk/ctk-menu-expandable.c	2010-09-16 00:12:23 +0000
+++ clutk/ctk-menu-expandable.c	2010-10-04 20:01:57 +0000
@@ -41,6 +41,9 @@
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
+
+#include <GL/gl.h>
+
 #include "ctk-menu.h"
 #include "ctk-menu-expandable.h"
 #include "ctk-menu-seperator.h"

=== modified file 'clutk/ctk-menu.c'
--- clutk/ctk-menu.c	2010-09-14 20:26:25 +0000
+++ clutk/ctk-menu.c	2010-10-04 20:01:57 +0000
@@ -26,6 +26,9 @@
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
+
+#include <GL/gl.h>
+
 #include "ctk-menu.h"
 #include <math.h>
 #include <glib.h>