isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-14 01:09:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove inclusion of Xlib headers in Cogl headers

Browse Source 
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>
This commit is contained in:
Zan Dobersek
2011-10-17 18:55:35 +02:00
committed by Robert Bragg
parent 5f7cdfed69
commit d8c47e25f2
16 changed files with 65 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cogl/cogl-xlib.h
View File

@ -21,17 +21,17 @@
* Boston, MA 02111-1307, USA.
*/
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly."
#endif
#ifndef __COGL_XLIB_H__
#define __COGL_XLIB_H__
#include <cogl/cogl-types.h>
#include <X11/Xlib.h>
#define __COGL_XLIB_H_INSIDE__
#include <cogl/cogl.h>
#include <cogl/cogl-clutter-xlib.h>
#include <cogl/cogl-xlib-renderer.h>
G_BEGIN_DECLS
/*
@ -81,4 +81,6 @@ cogl_xlib_set_display (Display *display);
CoglFilterReturn
cogl_xlib_handle_event (XEvent *xevent);
#undef __COGL_XLIB_H_INSIDE__
#endif /* __COGL_XLIB_H__ */