edje: backport r80201.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/edje-1.7@80202 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/AUTHORS b/AUTHORS
index 377e7f4..62ee3da 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -29,3 +29,4 @@ Kim Shinwoo <kimcinoo.efl@gmail.com>
 Michael Bouchaud (yoz) <michael.bouchaud@gmail.com>
 WooHyun Jung (woohyun) <woohyun0705@gmail.com>
 Guilherme Silveira <xguiga@gmail.com>
+Robert David <robert.david.public@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index ee493a0..dfb03da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -611,3 +611,6 @@
 
         1.7.2 release
 
+2012-12-05  Robert David
+
+       * Fix Solaris 11 build.

diff --git a/NEWS b/NEWS
index 21ced31..ea4106e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Fixes:
     * fix edje_text_class_set to update the text classes correctly.
     * fix to not update map uv for proxy
     * fix to not segv on inheriting group lookups
+    * fix build on Solaris 11
     
 Edje 1.7.1
 

diff --git a/src/bin/edje_inspector.c b/src/bin/edje_inspector.c
index 9106f95..01cf104 100644 (file)
--- a/src/bin/edje_inspector.c
+++ b/src/bin/edje_inspector.c
@@ -2,6 +2,11 @@
 # include "config.h"
 #endif
 
+#include <locale.h>
+#include <fnmatch.h>
+#include <unistd.h>
+#include <errno.h>
+
 #include "Edje.h"
 #define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT 1
 #include "Edje_Edit.h"
@@ -9,9 +14,6 @@
 #include <Ecore.h>
 #include <Ecore_Evas.h>
 #include <Ecore_Getopt.h>
-#include <locale.h>
-#include <fnmatch.h>
-#include <unistd.h>
 
 static int _log_dom;
 #define DBG(...) EINA_LOG_DOM_DBG(_log_dom, __VA_ARGS__)