[Cogl] [PATCH 1/4] Replace some #if HAVE_COGL_GL lines with #ifdef

[Robert Bragg]

This looks good to land to me:

Reviewed-by: Robert Bragg <robert at linux.intel.com>

thanks,
- Robert

On Thu, Jan 24, 2013 at 12:09 PM, Neil Roberts <neil at linux.intel.com> wrote:
> This was generating warnings when the GL driver is disabled.
> ---
>  cogl/cogl-auto-texture.c            | 2 +-
>  cogl/cogl-texture-rectangle.c       | 2 +-
>  cogl/driver/gl/cogl-texture-2d-gl.c | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/cogl/cogl-auto-texture.c b/cogl/cogl-auto-texture.c
> index c67c727..6df3fc2 100644
> --- a/cogl/cogl-auto-texture.c
> +++ b/cogl/cogl-auto-texture.c
> @@ -258,7 +258,7 @@ cogl_texture_gl_new_from_foreign (CoglContext *ctx,
>                                    CoglPixelFormat format,
>                                    CoglError **error)
>  {
> -#if HAVE_COGL_GL
> +#ifdef HAVE_COGL_GL
>    if (gl_target == GL_TEXTURE_RECTANGLE_ARB)
>      {
>        CoglTextureRectangle *texture_rectangle;
> diff --git a/cogl/cogl-texture-rectangle.c b/cogl/cogl-texture-rectangle.c
> index aeb905a..2c3c2a9 100644
> --- a/cogl/cogl-texture-rectangle.c
> +++ b/cogl/cogl-texture-rectangle.c
> @@ -373,7 +373,7 @@ cogl_texture_rectangle_new_from_foreign (CoglContext *ctx,
>
>    /* Obtain texture parameters */
>
> -#if HAVE_COGL_GL
> +#ifdef HAVE_COGL_GL
>    if (ctx->driver == COGL_DRIVER_GL)
>      {
>        GLint val;
> diff --git a/cogl/driver/gl/cogl-texture-2d-gl.c b/cogl/driver/gl/cogl-texture-2d-gl.c
> index f1c543f..a8a51a4 100644
> --- a/cogl/driver/gl/cogl-texture-2d-gl.c
> +++ b/cogl/driver/gl/cogl-texture-2d-gl.c
> @@ -375,7 +375,7 @@ cogl_texture_2d_gl_new_from_foreign (CoglContext *ctx,
>    /* Obtain texture parameters
>       (only level 0 we are interested in) */
>
> -#if HAVE_COGL_GL
> +#ifdef HAVE_COGL_GL
>    if ((ctx->private_feature_flags &
>         COGL_PRIVATE_FEATURE_QUERY_TEXTURE_PARAMETERS))
>      {
> --
> 1.7.11.3.g3c3efa5
>
> _______________________________________________
> Cogl mailing list
> Cogl at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/cogl