[cogl/msvc-support] Revert changes regarding COGL_HAS_WIN32_SUPPORT



commit cdd1554a12f41f255e0db8f0f53c75dfa1ec7a2d
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Jul 28 12:30:38 2011 +0800

    Revert changes regarding COGL_HAS_WIN32_SUPPORT
    
    Change the check macros back to COGL_HAS_WGL_SUPPORT from
    COGL_HAS_WIN32_SUPPORT as they should have been.
    
    COGL_HAS_WIN32_SUPPORT seems that it should only be used when the library
    is compiled

 cogl/cogl-defines.h.win32 |    2 +-
 cogl/cogl-renderer.c      |    4 ++--
 cogl/cogl.h               |    2 +-
 config.h.win32.in         |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/cogl/cogl-defines.h.win32 b/cogl/cogl-defines.h.win32
index 5fb328a..3309437 100644
--- a/cogl/cogl-defines.h.win32
+++ b/cogl/cogl-defines.h.win32
@@ -35,7 +35,7 @@
 
 G_BEGIN_DECLS
 
-#define COGL_HAS_WIN32_SUPPORT 1
+#define COGL_HAS_WGL_SUPPORT 1
 #define COGL_HAS_GL 1
 #define CLUTTER_COGL_HAS_GL 1
 
diff --git a/cogl/cogl-renderer.c b/cogl/cogl-renderer.c
index c8f10fb..5a4f570 100644
--- a/cogl/cogl-renderer.c
+++ b/cogl/cogl-renderer.c
@@ -46,7 +46,7 @@
 #ifdef COGL_HAS_GLX_SUPPORT
 extern const CoglWinsysVtable *_cogl_winsys_glx_get_vtable (void);
 #endif
-#ifdef COGL_HAS_WIN32_SUPPORT
+#ifdef COGL_HAS_WGL_SUPPORT
 extern const CoglWinsysVtable *_cogl_winsys_wgl_get_vtable (void);
 #endif
 
@@ -60,7 +60,7 @@ static CoglWinsysVtableGetter _cogl_winsys_vtable_getters[] =
 #ifdef COGL_HAS_EGL_SUPPORT
   _cogl_winsys_egl_get_vtable,
 #endif
-#ifdef COGL_HAS_WIN32_SUPPORT
+#ifdef COGL_HAS_WGL_SUPPORT
   _cogl_winsys_wgl_get_vtable,
 #endif
   _cogl_winsys_stub_get_vtable,
diff --git a/cogl/cogl.h b/cogl/cogl.h
index ff7f8f4..48c3749 100644
--- a/cogl/cogl.h
+++ b/cogl/cogl.h
@@ -96,7 +96,7 @@ typedef struct _CoglFramebuffer CoglFramebuffer;
 #if defined (COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT)
 #include <cogl/cogl-wayland-renderer.h>
 #endif
-#if COGL_HAS_WIN32_SUPPORT
+#if defined (COGL_HAS_WGL_SUPPORT)
 #include <cogl/cogl-win32-renderer.h>
 #endif
 /* XXX: This will definitly go away once all the Clutter winsys
diff --git a/config.h.win32.in b/config.h.win32.in
index cc7752f..22deb40 100644
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -7,7 +7,7 @@
 /*#undef COGL_HAS_GLX_SUPPORT*/
 
 /* Cogl supports OpenGL using the WGL API */
-#define COGL_HAS_WIN32_SUPPORT 1
+#define COGL_HAS_WGL_SUPPORT 1
 
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]