efreet: merge

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/efreet@47666 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/efreet_private.h b/src/lib/efreet_private.h
index 6725be1..c8845a1 100644 (file)
--- a/src/lib/efreet_private.h
+++ b/src/lib/efreet_private.h
@@ -4,6 +4,7 @@
 
 #include <Eet.h>
 
+#undef alloca
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
 #elif defined __GNUC__