jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=4f98b549159811d2f649a9e3eca6bbe20bc86740

commit 4f98b549159811d2f649a9e3eca6bbe20bc86740
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Mon Nov 6 14:23:57 2017 +0900

    cxx: Add beta define to Evas.hh
    
    This is probably temporary as well, but it's necessary to make examples
    compile (with rectangle).
---
 src/lib/evas/Evas.hh | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/lib/evas/Evas.hh b/src/lib/evas/Evas.hh
index 4bef41958f..893f895ca9 100644
--- a/src/lib/evas/Evas.hh
+++ b/src/lib/evas/Evas.hh
@@ -1,9 +1,23 @@
-#ifndef EFL_EVAS_HH
-#define EFL_EVAS_HH
-#ifdef EFL_BETA_API_SUPPORT
+#ifndef EVAS_HH
+#define EVAS_HH
 
-#include "Evas.eo.hh"
+#if defined(EVAS_H)
+#error "Do not include Evas C API headers before including Evas.hh"
+#endif
 
+#ifndef EFL_BETA_API_SUPPORT
+#define EFL_BETA_API_SUPPORT
 #endif
+#ifndef EFL_EO_API_SUPPORT
+#define EFL_EO_API_SUPPORT
 #endif
 
+#include <Efl.hh>
+
+extern "C" {
+#include "Evas.h"
+}
+
+#include "Evas.eo.hh"
+
+#endif

-- 


Reply via email to