sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

win32: Use the right macro name for COGL_HAS_WIN32_SUPPORT

Browse source 
Some places were using COGL_HAS_WIN32 but the only macro defined is
COGL_HAS_WIN32_SUPPORT. The similar macros such as COGL_HAS_XLIB are
only defined for compatibility with existing code but COGL_HAS_WIN32
was never defined so there's no need to support it.

One of the places was including the non-existant cogl-win32.h. This
has been removed because the file only temporarily existed during
development of the backend.
This commit is contained in:
Neil Roberts 2011-05-11 15:20:59 +01:00
parent a075f4498b
commit 442d4586b7
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cogl/cogl-framebuffer.h
View file

@ -30,9 +30,9 @@
#include <glib.h>
#ifdef COGL_HAS_WIN32
#ifdef COGL_HAS_WIN32_SUPPORT
#include <windows.h>
#endif /* COGL_HAS_WIN32 */
#endif /* COGL_HAS_WIN32_SUPPORT */
G_BEGIN_DECLS

3
cogl/cogl.h
View file

@ -88,9 +88,6 @@ typedef struct _CoglFramebuffer CoglFramebuffer;
#ifdef COGL_HAS_XLIB
#include <cogl/cogl-xlib.h>
#endif
#ifdef COGL_HAS_WIN32
#include <cogl/cogl-win32.h>
#endif
/* XXX: This will definitly go away once all the Clutter winsys
* code has been migrated down into Cogl! */
#include <cogl/cogl-clutter.h>