[cogl/wip/rib/cogl-1.12: 114/139] cogl-texture-2d-private: Include egl-defines.h



commit 5fff83cd3cbc17d5e05562e558c79349e161e5e2
Author: Neil Roberts <neil linux intel com>
Date:   Tue Jul 31 15:00:12 2012 +0100

    cogl-texture-2d-private: Include egl-defines.h
    
    The cogl-texture-2d-private.h header checks for the presence of
    EGL_KHR_image_base before declaring
    _cogl_egl_texture_2d_new_from_image. This define will only be
    available if the EGL headers are included so we should make sure that
    happens. This was resulting in a warning complaining that the function
    was not previously declared.
    
    Reviewed-by: Robert Bragg <robert linux intel com>
    
    (cherry picked from commit bd4840d7858efcf30eb5cf5d6fd0d39bdd59d1c1)

 cogl/cogl-texture-2d-private.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/cogl/cogl-texture-2d-private.h b/cogl/cogl-texture-2d-private.h
index 96b59d6..34abaa9 100644
--- a/cogl/cogl-texture-2d-private.h
+++ b/cogl/cogl-texture-2d-private.h
@@ -29,6 +29,10 @@
 #include "cogl-texture-private.h"
 #include "cogl-texture-2d.h"
 
+#ifdef COGL_HAS_EGL_SUPPORT
+#include "cogl-egl-defines.h"
+#endif
+
 struct _CoglTexture2D
 {
   CoglTexture     _parent;



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