[cogl] win32: Use the right macro name for COGL_HAS_WIN32_SUPPORT
- From: Neil Roberts <nroberts src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl] win32: Use the right macro name for COGL_HAS_WIN32_SUPPORT
- Date: Wed, 11 May 2011 14:19:52 +0000 (UTC)
commit 442d4586b721afc404354de654ed53e9cca093a4
Author: Neil Roberts <neil linux intel com>
Date: Wed May 11 15:20:59 2011 +0100
win32: Use the right macro name for COGL_HAS_WIN32_SUPPORT
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.
cogl/cogl-framebuffer.h | 4 ++--
cogl/cogl.h | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/cogl/cogl-framebuffer.h b/cogl/cogl-framebuffer.h
index 02188b7..50ac7cb 100644
--- a/cogl/cogl-framebuffer.h
+++ b/cogl/cogl-framebuffer.h
@@ -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
diff --git a/cogl/cogl.h b/cogl/cogl.h
index 75c37de..cbd2d0c 100644
--- a/cogl/cogl.h
+++ b/cogl/cogl.h
@@ -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>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]