isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix testing of undefined macro constants to check for definedness instead

Browse Source 
Reviewed-By: Robert Bragg <robert@linux.intel.com>
This commit is contained in:
Philip Withnall 2011-07-02 12:39:56 +01:00 committed by Robert Bragg
parent b8b37f6c41
commit d51c3c423e
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/cogl-fixed.c
View File

@ -626,7 +626,7 @@ cogl_fixed_sqrt (CoglFixed x)
/* /*
* Find the highest bit set * Find the highest bit set
*/ */
#if __arm__ #if defined (__arm__)
/* This actually requires at least arm v5, but gcc does not seem /* This actually requires at least arm v5, but gcc does not seem
* to set the architecture defines correctly, and it is I think * to set the architecture defines correctly, and it is I think
* very unlikely that anyone will want to use clutter on anything * very unlikely that anyone will want to use clutter on anything

4
cogl/cogl-framebuffer.h
View File

@ -34,7 +34,7 @@
#include <windows.h> #include <windows.h>
#endif /* COGL_HAS_WIN32_SUPPORT */ #endif /* COGL_HAS_WIN32_SUPPORT */
#if COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT #if defined (COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT)
#include <wayland-client.h> #include <wayland-client.h>
#endif /* COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT */ #endif /* COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT */
@ -379,7 +379,7 @@ HWND
cogl_win32_onscreen_get_window (CoglOnscreen *onscreen); cogl_win32_onscreen_get_window (CoglOnscreen *onscreen);
#endif /* COGL_HAS_WIN32_SUPPORT */ #endif /* COGL_HAS_WIN32_SUPPORT */
#if COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT #if defined (COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT)
struct wl_surface * struct wl_surface *
cogl_wayland_onscreen_get_surface (CoglOnscreen *onscreen); cogl_wayland_onscreen_get_surface (CoglOnscreen *onscreen);
#endif /* COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT */ #endif /* COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT */

4
cogl/cogl-renderer-private.h
View File

@ -34,7 +34,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#endif #endif
#if COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT #if defined (COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT)
#include <wayland-client.h> #include <wayland-client.h>
#endif #endif
@ -53,7 +53,7 @@ struct _CoglRenderer
GModule *libgl_module; GModule *libgl_module;
#endif #endif
#if COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT #if defined (COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT)
struct wl_display *foreign_wayland_display; struct wl_display *foreign_wayland_display;
struct wl_compositor *foreign_wayland_compositor; struct wl_compositor *foreign_wayland_compositor;
#endif #endif

2
cogl/cogl.h
View File

@ -93,7 +93,7 @@ typedef struct _CoglFramebuffer CoglFramebuffer;
#include <cogl/cogl-xlib.h> #include <cogl/cogl-xlib.h>
#include <cogl/cogl-xlib-renderer.h> #include <cogl/cogl-xlib-renderer.h>
#endif #endif
#if COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT #if defined (COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT)
#include <cogl/cogl-wayland-renderer.h> #include <cogl/cogl-wayland-renderer.h>
#endif #endif
/* XXX: This will definitly go away once all the Clutter winsys /* XXX: This will definitly go away once all the Clutter winsys