brl/mutter
1
0
Fork 0
Code Issues Pull Requests 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

10
cogl/cogl-clutter.h
View File

@ -28,10 +28,6 @@
#ifndef __COGL_CLUTTER_H__
#define __COGL_CLUTTER_H__
#ifdef COGL_HAS_XLIB
#include <X11/Xutil.h>
#endif
G_BEGIN_DECLS
#define cogl_clutter_check_extension cogl_clutter_check_extension_CLUTTER
@ -46,12 +42,6 @@ cogl_clutter_winsys_has_feature (CoglWinsysFeature feature);
void
cogl_onscreen_clutter_backend_set_size (int width, int height);
#ifdef COGL_HAS_XLIB
#define cogl_clutter_winsys_xlib_get_visual_info cogl_clutter_winsys_xlib_get_visual_info_CLUTTER
XVisualInfo *
cogl_clutter_winsys_xlib_get_visual_info (void);
#endif
G_END_DECLS
#endif /* __COGL_CLUTTER_H__ */