From bbad6e99236524a9834b2c766622ebf0e050c039 Mon Sep 17 00:00:00 2001
From: Andy Williams <andy@andywilliams.me>
Date: Fri, 10 Nov 2017 12:16:54 +0000
Subject: [PATCH] eo-classes: Use a single header from all c files

---
 tutorial/c/eo-classes/src/eo_classes.h        | 8 ++++++++
 tutorial/c/eo-classes/src/eo_classes_main.c   | 7 -------
 tutorial/c/eo-classes/src/example_rectangle.c | 3 ++-
 tutorial/c/eo-classes/src/example_shape.c     | 2 ++
 tutorial/c/eo-classes/src/example_square.c    | 4 ++--
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/tutorial/c/eo-classes/src/eo_classes.h b/tutorial/c/eo-classes/src/eo_classes.h
index cdafab51..6bddab09 100644
--- a/tutorial/c/eo-classes/src/eo_classes.h
+++ b/tutorial/c/eo-classes/src/eo_classes.h
@@ -1,9 +1,17 @@
+#ifndef _EO_CLASSES_H
+#define _EO_CLASSES_H 1
+
 #define EFL_EO_API_SUPPORT 1
+#ifndef EFL_BETA_API_SUPPORT
 #define EFL_BETA_API_SUPPORT 1
+#endif
 
 #include <Eina.h>
+#include <Efl.h>
+#include <Elementary.h>
 
 #include "example_shape.eo.h"
 #include "example_rectangle.eo.h"
 #include "example_square.eo.h"
 
+#endif
diff --git a/tutorial/c/eo-classes/src/eo_classes_main.c b/tutorial/c/eo-classes/src/eo_classes_main.c
index 2e2e29e5..2bf01404 100644
--- a/tutorial/c/eo-classes/src/eo_classes_main.c
+++ b/tutorial/c/eo-classes/src/eo_classes_main.c
@@ -1,10 +1,3 @@
-#define EFL_EO_API_SUPPORT 1
-#define EFL_BETA_API_SUPPORT 1
-
-#include <Eina.h>
-#include <Efl.h>
-#include <Elementary.h>
-
 #include "eo_classes.h"
 
 Example_Shape *
diff --git a/tutorial/c/eo-classes/src/example_rectangle.c b/tutorial/c/eo-classes/src/example_rectangle.c
index c268bc18..1a1dbd3a 100644
--- a/tutorial/c/eo-classes/src/example_rectangle.c
+++ b/tutorial/c/eo-classes/src/example_rectangle.c
@@ -1,7 +1,8 @@
 #define EFL_BETA_API_SUPPORT
 #include <Eo.h>
 #include "example_rectangle.eo.h"
-#include "example_shape.eo.h"
+
+#include "eo_classes.h"
 
 typedef struct
 {
diff --git a/tutorial/c/eo-classes/src/example_shape.c b/tutorial/c/eo-classes/src/example_shape.c
index 7ed49aa0..5f3b766a 100644
--- a/tutorial/c/eo-classes/src/example_shape.c
+++ b/tutorial/c/eo-classes/src/example_shape.c
@@ -2,4 +2,6 @@
 #include <Eo.h>
 #include "example_shape.eo.h"
 
+#include "eo_classes.h"
+
 #include "example_shape.eo.c"
diff --git a/tutorial/c/eo-classes/src/example_square.c b/tutorial/c/eo-classes/src/example_square.c
index bbb904d8..ea814532 100644
--- a/tutorial/c/eo-classes/src/example_square.c
+++ b/tutorial/c/eo-classes/src/example_square.c
@@ -1,8 +1,8 @@
 #define EFL_BETA_API_SUPPORT
 #include <Eo.h>
 #include "example_square.eo.h"
-#include "example_rectangle.eo.h"
-#include "example_shape.eo.h"
+
+#include "eo_classes.h"
 
 typedef struct
 {