brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use #if with defines that are either defined or not

Browse Source 
COGL_HAS_* and COGL_ENABLE_DEBUG are either defined in config.h or not.

So let's test against this, not against their truth value, this allow us
to use -Wundef to catch undefined macros in preprocessor directives.

(cherry picked from commit 73b62832f24711073b0876a6c0f5c61727842c1c)
This commit is contained in:
Damien Lespiau 2012-12-29 02:00:00 +00:00 committed by Robert Bragg
parent 1f0b432a25
commit b8d9bbed1a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/cogl-display-private.h
View File

@ -30,7 +30,7 @@
#include "cogl-renderer.h" #include "cogl-renderer.h"
#include "cogl-onscreen-template.h" #include "cogl-onscreen-template.h"
#include "cogl-internal.h" #include "cogl-internal.h"
#if COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT #ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
#include <wayland-server.h> #include <wayland-server.h>
#endif #endif

4
cogl/cogl-renderer.c
View File

@ -73,7 +73,7 @@
#include "cogl-winsys-sdl-private.h" #include "cogl-winsys-sdl-private.h"
#endif #endif
#if COGL_HAS_XLIB_SUPPORT #ifdef COGL_HAS_XLIB_SUPPORT
#include "cogl-xlib-renderer.h" #include "cogl-xlib-renderer.h"
#endif #endif
@ -188,7 +188,7 @@ cogl_renderer_new (void)
return _cogl_renderer_object_new (renderer); return _cogl_renderer_object_new (renderer);
} }
#if COGL_HAS_XLIB_SUPPORT #ifdef COGL_HAS_XLIB_SUPPORT
void void
cogl_xlib_renderer_set_foreign_display (CoglRenderer *renderer, cogl_xlib_renderer_set_foreign_display (CoglRenderer *renderer,
Display *xdisplay) Display *xdisplay)

2
cogl/cogl-util.h
View File

@ -194,7 +194,7 @@ _cogl_util_popcountl (unsigned long num)
#define _COGL_RETURN_IF_FAIL(EXPR) g_return_if_fail(EXPR) #define _COGL_RETURN_IF_FAIL(EXPR) g_return_if_fail(EXPR)
#define _COGL_RETURN_VAL_IF_FAIL(EXPR, VAL) g_return_val_if_fail(EXPR, VAL) #define _COGL_RETURN_VAL_IF_FAIL(EXPR, VAL) g_return_val_if_fail(EXPR, VAL)
#else #else
#if COGL_ENABLE_DEBUG #ifdef COGL_ENABLE_DEBUG
#define _COGL_RETURN_START do { #define _COGL_RETURN_START do {
#define _COGL_RETURN_END } while (0) #define _COGL_RETURN_END } while (0)
#else /* COGL_ENABLE_DEBUG */ #else /* COGL_ENABLE_DEBUG */