diff options
| author | Zan Dobersek <zandobersek@gmail.com> | 2011-10-17 18:55:35 +0200 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2011-11-01 15:55:53 +0000 |
| commit | d8c47e25f2af58ee3be6d4df9d96b1729b8f590c (patch) | |
| tree | 3f4feb528018bfa2da5c9beaa9e23d234d6c2ff9 /cogl/cogl-xlib-renderer.h | |
| parent | 5f7cdfed69b97c896f740a03e447f8de907e3e96 (diff) | |
| download | cogl-d8c47e25f2af58ee3be6d4df9d96b1729b8f590c.tar.gz | |
Remove inclusion of Xlib headers in Cogl headers
Xlib headers define many trivially named objects which can later cause
name collision problems when only cogl.h header is included in a program
or library. Xlib headers are now only included through including the
standalone header cogl-xlib.h.
https://bugzilla.gnome.org/show_bug.cgi?id=661174
Reviewed-by: Robert Bragg <robert@linux.intel.com>
Diffstat (limited to 'cogl/cogl-xlib-renderer.h')
| -rw-r--r-- | cogl/cogl-xlib-renderer.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cogl/cogl-xlib-renderer.h b/cogl/cogl-xlib-renderer.h index 64e06415..0afd568f 100644 --- a/cogl/cogl-xlib-renderer.h +++ b/cogl/cogl-xlib-renderer.h @@ -21,15 +21,14 @@ * Boston, MA 02111-1307, USA. */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) -#error "Only <cogl/cogl.h> can be included directly." +#if !defined(__COGL_XLIB_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#error "Only <cogl/cogl-xlib.h> can be included directly." #endif #ifndef __COGL_XLIB_RENDERER_H__ #define __COGL_XLIB_RENDERER_H__ -#include <cogl/cogl-types.h> -#include <cogl/cogl-renderer.h> +#include <cogl/cogl.h> #include <X11/Xlib.h> |