From 3c48d7e6d092f1b2b71a15bf77bbc1e8c8f9d2fe Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Sun, 25 Oct 2009 11:19:12 +0000
Subject: [PATCH]  * include config.h in all source files  * declare alloca
 before the standard headers  * include Evil.h for the declaration of realpath
 in edje_cc_prefix.c

SVN revision: 43263
---
 legacy/edje/src/bin/edje_cc.c          |  4 ++++
 legacy/edje/src/bin/edje_cc_handlers.c |  4 ++++
 legacy/edje/src/bin/edje_cc_mem.c      |  4 ++++
 legacy/edje/src/bin/edje_cc_out.c      | 10 +++++-----
 legacy/edje/src/bin/edje_cc_parse.c    | 18 +++++++++---------
 legacy/edje/src/bin/edje_cc_sources.c  |  4 ++++
 legacy/edje/src/bin/edje_prefix.c      |  4 ++++
 7 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/legacy/edje/src/bin/edje_cc.c b/legacy/edje/src/bin/edje_cc.c
index 93b7d509a5..92b740aea1 100644
--- a/legacy/edje/src/bin/edje_cc.c
+++ b/legacy/edje/src/bin/edje_cc.c
@@ -2,6 +2,10 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <string.h>
 #include <locale.h>
 #include <limits.h>
diff --git a/legacy/edje/src/bin/edje_cc_handlers.c b/legacy/edje/src/bin/edje_cc_handlers.c
index 370372469b..168a768b8f 100644
--- a/legacy/edje/src/bin/edje_cc_handlers.c
+++ b/legacy/edje/src/bin/edje_cc_handlers.c
@@ -28,6 +28,10 @@
     \@endproperty
 */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
diff --git a/legacy/edje/src/bin/edje_cc_mem.c b/legacy/edje/src/bin/edje_cc_mem.c
index a4c2cf8195..be611ce562 100644
--- a/legacy/edje/src/bin/edje_cc_mem.c
+++ b/legacy/edje/src/bin/edje_cc_mem.c
@@ -2,6 +2,10 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <string.h>
 #include <errno.h>
 
diff --git a/legacy/edje/src/bin/edje_cc_out.c b/legacy/edje/src/bin/edje_cc_out.c
index 2d61736dae..2c5ae3d50a 100644
--- a/legacy/edje/src/bin/edje_cc_out.c
+++ b/legacy/edje/src/bin/edje_cc_out.c
@@ -6,11 +6,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
-#include <limits.h>
-#include <unistd.h>
-#include <sys/stat.h>
-
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
 #elif defined __GNUC__
@@ -28,6 +23,11 @@ extern "C"
 void *alloca (size_t);
 #endif
 
+#include <string.h>
+#include <limits.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
 #include <Ecore_Evas.h>
 
 #include "edje_cc.h"
diff --git a/legacy/edje/src/bin/edje_cc_parse.c b/legacy/edje/src/bin/edje_cc_parse.c
index 1c3306f194..f438c452a1 100644
--- a/legacy/edje/src/bin/edje_cc_parse.c
+++ b/legacy/edje/src/bin/edje_cc_parse.c
@@ -6,15 +6,6 @@
 # include <config.h>
 #endif
 
-#include <string.h>
-#include <ctype.h>
-#include <limits.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
 #elif defined __GNUC__
@@ -32,6 +23,15 @@ extern "C"
 void *alloca (size_t);
 #endif
 
+#include <string.h>
+#include <ctype.h>
+#include <limits.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+
 #include "edje_cc.h"
 
 static void  new_object(void);
diff --git a/legacy/edje/src/bin/edje_cc_sources.c b/legacy/edje/src/bin/edje_cc_sources.c
index 5c52e7d167..5778a5e508 100644
--- a/legacy/edje/src/bin/edje_cc_sources.c
+++ b/legacy/edje/src/bin/edje_cc_sources.c
@@ -2,6 +2,10 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <string.h>
 #include <ctype.h>
 #include <limits.h>
diff --git a/legacy/edje/src/bin/edje_prefix.c b/legacy/edje/src/bin/edje_prefix.c
index 18f45b9fcb..9a8fb21c9f 100644
--- a/legacy/edje/src/bin/edje_prefix.c
+++ b/legacy/edje/src/bin/edje_prefix.c
@@ -21,6 +21,10 @@
 #include <time.h>
 #include <dirent.h>
 
+#ifdef HAVE_EVIL
+# include <Evil.h>
+#endif
+
 #include "edje_prefix.h"
 
 #ifdef _WIN32