summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-11-06 14:23:57 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-11-07 09:57:24 +0900
commit4f98b549159811d2f649a9e3eca6bbe20bc86740 (patch)
tree0bc9a3a1f2f6802dbdcdd150365efedca4cc7399
parent5f5325ea333a5ea6caa55ce5d7aa702ee6b689a1 (diff)
downloadefl-4f98b549159811d2f649a9e3eca6bbe20bc86740.tar.gz
cxx: Add beta define to Evas.hh
This is probably temporary as well, but it's necessary to make examples compile (with rectangle).
-rw-r--r--src/lib/evas/Evas.hh22
1 files 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