[cogl/cogl-1.16] cogl: further fix for including cogl-path.h



commit d9cf4222537d5d3f845e9705298b3baa3fc2ae1e
Author: Robert Bragg <robert linux intel com>
Date:   Tue Aug 20 12:14:12 2013 +0100

    cogl: further fix for including cogl-path.h
    
    This now updates the guard to ignore whether
    COGL_ENABLE_EXPERIMENTAL_2_0_API is defined since we need to work for
    clutter which does define that, as well as clutter users that don't.

 cogl/cogl.h |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/cogl/cogl.h b/cogl/cogl.h
index a6b0747..d678d08 100644
--- a/cogl/cogl.h
+++ b/cogl/cogl.h
@@ -139,8 +139,7 @@
  * The cogl_path_ api used to be part of the core Cogl api so for
  * compatability we include cogl-path.h via cogl.h
  */
-#if !defined (COGL_ENABLE_EXPERIMENTAL_2_0_API) && \
-    defined (COGL_HAS_COGL_PATH_SUPPORT)
+#if defined (COGL_HAS_COGL_PATH_SUPPORT)
 #include <cogl-path/cogl-path.h>
 #endif
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]