diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2012-05-16 17:36:38 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2012-05-22 01:45:07 +0800 |
| commit | 6edb17c586b1b0f185efefdedacc26bcff991f77 (patch) | |
| tree | 58b6240c001a16cd88136d6fe9dac1b379d97afe | |
| parent | a4f04cf17798b1cc0b6d97c924c5fa5fb66a90f0 (diff) | |
| download | clutter-6edb17c586b1b0f185efefdedacc26bcff991f77.tar.gz | |
Bug 676150 GDK: Fix build on Windows
-Don't include unistd.h and stdint.h unconditionally as not all Windows
compilers have them around.
-Only include cogl/cogl-xlib.h when it is really supported by Cogl and GDK.
-sys/ioctl.h is not available on Windows (MinGW/MSVC).
-Correct the call to cogl_renderer_set_winsys_id:
(backend_cogl->cogl_renderer, COGL_WINSYS_ID_WGL) ->
(renderer, COGL_WINSYS_ID_WGL)
| -rw-r--r-- | clutter/gdk/clutter-backend-gdk.c | 11 | ||||
| -rw-r--r-- | clutter/gdk/clutter-device-manager-gdk.c | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/clutter/gdk/clutter-backend-gdk.c b/clutter/gdk/clutter-backend-gdk.c index 4660525ad..42bdc7943 100644 --- a/clutter/gdk/clutter-backend-gdk.c +++ b/clutter/gdk/clutter-backend-gdk.c @@ -26,8 +26,9 @@ #include <glib/gi18n-lib.h> #include <string.h> +#ifdef HAVE_UNISTD_H #include <unistd.h> -#include <sys/ioctl.h> +#endif #include <sys/stat.h> #include <sys/types.h> #include <fcntl.h> @@ -36,7 +37,13 @@ #include <gdk/gdk.h> #include <cogl/cogl.h> +#ifndef GDK_WINDOWING_WIN32 +#include <sys/ioctl.h> +#endif + +#if defined(GDK_WINDOWING_X11) && defined(COGL_HAS_XLIB_SUPPORT) #include <cogl/cogl-xlib.h> +#endif #ifdef GDK_WINDOWING_X11 #include <gdk/gdkx.h> @@ -277,7 +284,7 @@ clutter_backend_gdk_get_renderer (ClutterBackend *backend, if (GDK_IS_WIN32_DISPLAY (backend_gdk->display)) { /* Force a WGL winsys on windows */ - cogl_renderer_set_winsys_id (backend_cogl->cogl_renderer, COGL_WINSYS_ID_WGL); + cogl_renderer_set_winsys_id (renderer, COGL_WINSYS_ID_WGL); } else #endif diff --git a/clutter/gdk/clutter-device-manager-gdk.c b/clutter/gdk/clutter-device-manager-gdk.c index 5175bbab5..3442699b0 100644 --- a/clutter/gdk/clutter-device-manager-gdk.c +++ b/clutter/gdk/clutter-device-manager-gdk.c @@ -24,7 +24,9 @@ #include "config.h" +#ifdef HAVE_STDINT_H #include <stdint.h> +#endif #include "clutter-device-manager-gdk.h" |