[cogl/msvc-support: 16/16] Merge branch 'master' into msvc-support

[Chun-wei Fan <fanchunwei src gnome org>]

commit c5cf8e3890934e2c3c6a657d5f779e22cef34b94
Merge: a8618c2 f7bdc92
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Aug 1 11:03:49 2011 +0800

    Merge branch 'master' into msvc-support
    
    Conflicts:
    	cogl/cogl.h

 .gitignore                                      |    2 +
 cogl/cogl-display-private.h                     |    2 +-
 cogl/cogl-display.c                             |   27 ++++++--
 cogl/{cogl-display.h => cogl-display.h.in}      |    4 +-
 cogl/cogl-framebuffer.c                         |    2 +
 cogl/cogl.h                                     |    2 +-
 cogl/winsys/cogl-winsys-egl-feature-functions.h |    2 +
 cogl/winsys/cogl-winsys-egl.c                   |   76 ++++++++++++++++++++---
 cogl/winsys/cogl-winsys-glx.c                   |    8 +++
 configure.ac                                    |   26 ++++++--
 10 files changed, 126 insertions(+), 25 deletions(-)
---
diff --cc .gitignore
index 5452cd3,5061a5e..66b1a18
--- a/.gitignore
+++ b/.gitignore
@@@ -23,10 -23,10 +23,11 @@@ stamp-marsha
  *.gir
  *.typelib
  /cogl/cogl-defines.h
+ /cogl/cogl-display.h
  /cogl/cogl-enum-types.c
  /cogl/cogl-enum-types.h
 -config.*
 +config.h
 +config.h.in
  configure
  depcomp
  /doc/reference/cogl/cogl-*.txt
diff --cc cogl/cogl.h
index 48c3749,ff7f8f4..bae2faa
--- a/cogl/cogl.h
+++ b/cogl/cogl.h
@@@ -96,7 -96,7 +96,7 @@@ typedef struct _CoglFramebuffer CoglFra
  #if defined (COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT)
  #include <cogl/cogl-wayland-renderer.h>
  #endif
- #if defined (COGL_HAS_WGL_SUPPORT)
 -#if COGL_HAS_WIN32_SUPPORT
++#if defined (COGL_HAS_WIN32_SUPPORT)
  #include <cogl/cogl-win32-renderer.h>
  #endif
  /* XXX: This will definitly go away once all the Clutter winsys